From a16e30a65652876bb5848d66d65c1d7c02307ce5 Mon Sep 17 00:00:00 2001
From: George Goodall <ggoodall@scottlogic.com>
Date: Wed, 11 Oct 2023 13:40:55 +0100
Subject: [PATCH] remove merge issue pointers

---
 changeLog.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/changeLog.md b/changeLog.md
index 0f54117e..518752b3 100644
--- 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