Resolve merge conflicts

CSE2102-Spring25 · Apr 18, 2025 · d9baa1c · d9baa1c
2 parents 3ea3c79 + 0c4ee79
commit d9baa1c
Show file tree

Hide file tree

Showing 12 changed files with 653 additions and 650 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+/backend/animal_shelter.db
+/backend/test_animal_shelter.db
+/frontend/node_modules