Skip to content

Commit

Permalink
Remove git merge conflict delimiter.
Browse files Browse the repository at this point in the history
  • Loading branch information
@nusbaume
nusbaume committed Oct 21, 2024
1 parent 0724952 commit 59e8699
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion doc/ChangeLog
View file
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,6 @@ Summarize any changes to answers:

===============================================================

>>>>>>> upstream/cam_development
Tag name: cam6_4_038
Originator(s): lizziel
Date: 1 Oct 2024
Expand Down

0 comments on commit 59e8699

Please sign in to comment.