Resolve conflicts.

multiverseweb · Nov 17, 2024 · 1e4e8fc · 1e4e8fc
2 parents b1e207a + 7b330ab
commit 1e4e8fc
Show file tree

Hide file tree

Showing 9 changed files with 612 additions and 582 deletions.
diff --git a/Documentation/PROJECT_STRUCTURE.md b/Documentation/PROJECT_STRUCTURE.md
@@ -62,7 +62,8 @@
     │   ├── codeOfconduct.js
     │   ├── contributor.js
     │   ├── license.js
-    │   └── script.js
+    │   ├── script.js
+    │   └── sharedUtilities.js
     ├── styles/
     │   ├── 404.css
     │   ├── contributor.css

diff --git a/Documentation/repo_structure.txt b/Documentation/repo_structure.txt
@@ -58,7 +58,8 @@
     │   ├── codeOfconduct.js
     │   ├── contributor.js
     │   ├── license.js
-    │   └── script.js
+    │   ├── script.js
+    │   └── sharedUtilities.js
     ├── styles/
     │   ├── 404.css
     │   ├── contributor.css

diff --git a/index.html b/index.html
@@ -320,7 +320,7 @@
     </div>
     <div class="end_line"></div>
     <script src="https://unpkg.com/leaflet@1.7.1/dist/leaflet.js"></script>
-    <script src="website/scripts/script.js"></script>
+    <script src="website/scripts/script.js" type="module"></script>
 
 
 </body>

diff --git a/software/__pycache__/financeTracker.cpython-311.pyc b/software/__pycache__/financeTracker.cpython-311.pyc