Merge pull request 'Undo merge conflict resolution' (#35 ) from amedee/polycule:fix-merge-conflict into main

Reviewed-on: #35
Undo merge conflict resolution
2025-02-11 06:31:14 +01:00 · 2025-02-10 19:41:27 +01:00
1 changed files with 0 additions and 6 deletions
--- a/polycule.puml
+++ b/polycule.puml
@@ -55,9 +55,6 @@ circle Pieter
 circle Anton
 circle Wyvern
 circle Tom
 circle Jelle 
 circle Valerie
 circle Lies
 Elizabeth -- Jenna: Partner
 Mira --  Rachel: Married
@@ -104,9 +101,6 @@ Mira .. Laure: Casual
 Hannah -- "Lara/Lance": Partner
 Helena -- "Lara/Lance": Partner
 Charlotte -- Lotte: Partner
 Jelle -- Valerie: Partner
 Jelle .. Hester: Casual
 Jelle .. Lies: Dating
 "Emily-Larra" .. Oriana : Casual
 "Emily-Larra" .. Alex : Casual
 "Emily-Larra" .. Avery : Casual
Author	SHA1	Message	Date
Elizhium	171b9d0f47	Merge pull request 'Undo merge conflict resolution' (#35 ) from amedee/polycule:fix-merge-conflict into main All checks were successful Publish diagram / render (push) Successful in 26s Details Publish diagram / publish (push) Successful in 7s Details Reviewed-on: #35	2025-02-11 06:31:14 +01:00
amedee	db67bc7512	Undo merge conflict resolution All checks were successful Render diagram / render (pull_request) Successful in 25s Details Removed connections were re-added in `46a1126c` and `434fb586`. This commit removes them again.	2025-02-10 19:41:27 +01:00