merge conflicts

acmucsd · Sep 22, 2024 · 9a8729e · 9a8729e
2 parents de7d382 + c08ca49
commit 9a8729e
Show file tree

Hide file tree

Showing 37 changed files with 17,634 additions and 1,946 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1 @@
-* @acmucsd/acm-hack @nishantbalaji @alexzhang1618
+* @acmucsd/acm-hack @alexzhang1618