From b0f1a2b694c6f3f34556701f5da5c07a2af481c0 Mon Sep 17 00:00:00 2001
From: lpg-tech <lpg@ganimedes.ch>
Date: Wed, 6 Dec 2023 23:07:29 +0100
Subject: [PATCH] remove traces of uncomplete merging

---
 input/fsh/instances/practitioner/ArminAhrens.fsh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/input/fsh/instances/practitioner/ArminAhrens.fsh b/input/fsh/instances/practitioner/ArminAhrens.fsh
index 0b9e9b2c..faf632f6 100644
--- a/input/fsh/instances/practitioner/ArminAhrens.fsh
+++ b/input/fsh/instances/practitioner/ArminAhrens.fsh
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-=======
-// moved to 6-histopath-ServiceRequest
->>>>>>> d8dd1068ca04fbf47ccb1302bd76728d94c0e925
 Instance: ArminAhrens
 InstanceOf: CHCorePractitioner
 Title: "Armin Ahrens"