merge conflict resolved

mayflyTeam · Jan 3, 2024 · 06fca4d · 06fca4d
2 parents 6d7b753 + 640f7d2
commit 06fca4d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/CNAME b/CNAME
@@ -1 +1 @@
-www.mayfly.dev
+www.mayfly.dev
diff --git a/index.html b/index.html
@@ -382,4 +382,4 @@ <h2 class="four">10 Future Work</h2>
 			<script src="assets/js/main.js"></script>
 
 	</body>
-</html>
+</html>
-Original file line number
+Diff line change
@@ Expand Up / @@ -382,4 +382,4 @@ <h2 class="four">10 Future Work</h2> @@
     			<script src="assets/js/main.js"></script>
     	</body>
-    </html>
+    </html>