Fixed some stupid merge stuff

ALEEF02 · Dec 7, 2023 · b836f9e · b836f9e
1 parent 996e444
commit b836f9e
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/UML/DrawIO/InteractionDiagram.drawio b/UML/DrawIO/InteractionDiagram.drawio
@@ -1,12 +1,6 @@
-<<<<<<< Updated upstream
-<mxfile host="app.diagrams.net" modified="2023-12-07T16:02:18.542Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36" etag="u-85ZFOyq7jtZsgN3ITm" version="22.1.7" type="device">
-  <diagram id="JHvTjUsWatYXb-uX-RTq" name="Page-1">
-    <mxGraphModel dx="263" dy="144" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
-=======
 <mxfile host="app.diagrams.net" modified="2023-12-07T19:58:00.572Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36" etag="K29OIhA3DQK_xRKfxYUn" version="22.1.7" type="device">
   <diagram id="JHvTjUsWatYXb-uX-RTq" name="Page-1">
     <mxGraphModel dx="429" dy="256" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
->>>>>>> Stashed changes
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -587,13 +581,8 @@
             <mxPoint x="372.75" y="1330" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-<<<<<<< Updated upstream
         <mxCell id="-RTj4_jvdrbvGM9pnTlL-1" value="" style="ellipse;html=1;shape=endState;fillColor=#000000;strokeColor=#ff0000;" parent="1" vertex="1">
           <mxGeometry x="360" y="1860" width="30" height="30" as="geometry" />
-=======
-        <mxCell id="-RTj4_jvdrbvGM9pnTlL-1" value="" style="ellipse;html=1;shape=endState;fillColor=#000000;strokeColor=#ff0000;" vertex="1" parent="1">
-          <mxGeometry x="355" y="1650" width="30" height="30" as="geometry" />
->>>>>>> Stashed changes
         </mxCell>
         <mxCell id="-RTj4_jvdrbvGM9pnTlL-2" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.508;entryY=1;entryDx=0;entryDy=0;entryPerimeter=0;exitX=0.532;exitY=1.019;exitDx=0;exitDy=0;exitPerimeter=0;" parent="1" source="DWZ_4HrFMzU2AhQ7Lu3O-106" edge="1">
           <mxGeometry relative="1" as="geometry">