Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
lpg-tech committed Dec 6, 2023
2 parents b872ed0 + b0f1a2b commit 3b4d6cd
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions input/fsh/instances/practitioner/ArminAhrens.fsh
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
<<<<<<< HEAD
=======
// moved to 6-histopath-ServiceRequest
>>>>>>> d8dd1068ca04fbf47ccb1302bd76728d94c0e925
Instance: ArminAhrens
InstanceOf: CHCorePractitioner
Title: "Armin Ahrens"
Expand Down

0 comments on commit 3b4d6cd

Please sign in to comment.