Hellen casual

Merge pull request 'Oriana and Gwen no longer casuals' (#48 ) from lotte02/polycule:main into main
Reviewed-on: Elizhium/polycule#48
2025-05-18 01:39:09 +02:00 · 2025-05-05 00:01:40 +02:00 · 2025-05-04 22:27:20 +02:00 · 2025-04-30 06:58:11 +02:00 · 2025-04-27 10:14:05 +02:00 · 2025-04-17 09:56:07 +02:00
1 changed files with 11 additions and 3 deletions
--- a/polycule.puml
+++ b/polycule.puml
@@ -45,7 +45,7 @@ circle Hannah
 circle Tara
 circle Lara/Lance
 circle Lotte
-circle Laure
+' circle Laure
 circle Helena
 circle Oriana
 circle Alex
@@ -57,7 +57,13 @@ 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
@@ -99,7 +105,6 @@ Tara -- Evi: Partner
 Tara .. Amedee: Casual
 Elizabeth -- "Emily-Larra-Sarah": Partner
 Mira .. Glas: Casual
-Mira .. Laure: Casual
 Hannah -- "Lara/Lance": Partner
 Helena -- "Lara/Lance": Partner
 Charlotte -- Lotte: Engaged
@@ -111,12 +116,15 @@ Anton .. Tine: Dating
 Rosie -- Wyvern: Partner
 Hester .. Tom
 "Emily-Larra-Sarah" .. "Gwen" : Casual
-Oriana .. "Gwen" : Casual
 "Emily-Larra-Sarah" .. Lotte: Casual
 "Emily-Larra-Sarah" .. Charlotte  : Casual
 Mira -- "Lara/Lance": Partner
 Tara .. Sarah: Casual
 Amber -- Nicholas : Partner
 "Emily-Larra-Sarah" .. Hellen : Casual
+Evi .. Kris : Casual
+Tara .. Gwen: Casual
+Hannah .. Nari : Casual
+Nari -- Ara : Partner

@enduml
Author	SHA1	Message	Date
Larra Emily Sarah	adcdf65f60	Hellen casual	2025-05-18 01:39:09 +02:00
Elizhium	c1ff2700cb	Merge pull request 'Oriana and Gwen no longer casuals' (#48 ) from lotte02/polycule:main into main Reviewed-on: Elizhium/polycule#48	2025-05-05 00:01:40 +02:00
lotte02	43c7250322	Oriana and Gwen no longer casuals	2025-05-04 22:27:20 +02:00
Elizhium	b2a9620480	Merge pull request 'Nari x Hannah casual, addition of Nari and Ara' (#47 ) from Mira91/polycule:main into main Reviewed-on: Elizhium/polycule#47	2025-04-30 06:58:11 +02:00
Mira91	1bfa17ce55	Update polycule.puml	2025-04-27 10:14:05 +02:00
Elizhium	c4fec7ac09	Update polycule.puml	2025-04-17 09:56:07 +02:00
Elizhium	18d592bee4	Merge pull request 'Addition of Evi x Kris, removal of Mira x Laure' (#46 ) from Mira91/polycule:main into main Reviewed-on: Elizhium/polycule#46	2025-04-17 09:49:17 +02:00
Mira91	37b3f3b02a	Addition of Evi x Kris, removal of Mira x Laure	2025-04-16 11:55:38 +02:00
Elizhium	39b39f4655	Merge pull request 'Lotte and Larra stop dating same for Gwen and Oriana' (#45 ) from Emily-Sarah-Larra/polycule:main into main Reviewed-on: Elizhium/polycule#45	2025-04-09 17:30:05 +02:00