remove merge issue pointers

digital-land · Oct 11, 2023 · a16e30a · a16e30a
1 parent e90bcb2
commit a16e30a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/changeLog.md b/changeLog.md
@@ -20,10 +20,6 @@
 - Added an acceptance test that tests loading the swagger editor with the correct openAPI json
 ### Why was this change made?
 - because these user journeys were documented as part of a recent group session we did
-<<<<<<< HEAD
-
-=======
->>>>>>> 461ef27 (updated changelog)
 
 ## 09-10-2023
 ### What's new