commit

Merge branch 'master' of https://github.com/AdamWilsonLabEDU/final-project-andreaharder # Conflicts: # about.qmd
AdamWilsonLabEDU · Dec 13, 2024 · e5d994b · e5d994b
2 parents c2ddc3e + c0a143e
commit e5d994b
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/about.qmd b/about.qmd
@@ -0,0 +1,4 @@
+<<<<<<< HEAD
+=======
+
+>>>>>>> c0a143ed680f975904f943205842bdf24eb606c6