Skip to content

Commit a7ee23f

Browse files
carlieyungcarlieyung
committed
Merge remote-tracking branch 'origin/Team2Main' into Team2Main
# Conflicts: # src/algorithms/controllers/Prototype.js # src/algorithms/parameters/index.js
2 parents 25eb700 + b2406cb commit a7ee23f

File tree

12 files changed

+205
-424
lines changed

12 files changed

+205
-424
lines changed

‎.idea/workspace.xml

Lines changed: 121 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎doc/JEFF's DIAGRAM.drawio

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<mxfile host="app.diagrams.net" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:129.0) Gecko/20100101 Firefox/129.0" version="24.7.7">
2+
<diagram name="Page-1" id="6o86HdKBXhTW1Fx119Ol">
3+
<mxGraphModel>
4+
<root>
5+
<mxCell id="0" />
6+
<mxCell id="1" parent="0" />
7+
</root>
8+
</mxGraphModel>
9+
</diagram>
10+
</mxfile>

‎docs/JEFF'S DIAGRAM.drawio

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<mxfile host="app.diagrams.net" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:129.0) Gecko/20100101 Firefox/129.0" version="24.7.7">
2+
<diagram name="Page-1" id="p3gGA-UtOjG6gqDrzBgT">
3+
<mxGraphModel>
4+
<root>
5+
<mxCell id="0" />
6+
<mxCell id="1" parent="0" />
7+
</root>
8+
</mxGraphModel>
9+
</diagram>
10+
</mxfile>

‎docs/JEFF's DIAGRAM.drawio

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<mxfile host="app.diagrams.net" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:129.0) Gecko/20100101 Firefox/129.0" version="24.7.7">
2+
<diagram name="Page-1" id="3I5aULWO9aWHs0gA7pSZ">
3+
<mxGraphModel>
4+
<root>
5+
<mxCell id="0" />
6+
<mxCell id="1" parent="0" />
7+
</root>
8+
</mxGraphModel>
9+
</diagram>
10+
</mxfile>

0 commit comments

Comments
 (0)