F fix merge entity conflicts
Compare changes
- florian authored
+ 41
− 3
@@ -188,9 +188,8 @@ def getCommitIn(folder):
@@ -204,6 +203,20 @@ def compare_entities(old_entity: Entity, new_entity: Entity):
@@ -269,7+282,7 @@
@@ -300,7+313,7 @@