2025-05-21 17:22:33 +02:00
1 changed files with 0 additions and 3 deletions
--- a/polycule.puml
+++ b/polycule.puml
@@ -57,13 +57,10 @@ circle Tom
 circle Gwen
 circle Sarah
 circle Nicholas
-<<<<<<< HEAD
 circle Hellen
-=======
 circle Kris
 circle Nari
 circle Ara
->>>>>>> upstream/main

 Elizabeth -- Jenna: Partner
 Mira --  Rachel: Married