merge conflicts again lol

calblueprint · Oct 9, 2024 · 94b134e · 94b134e
2 parents 0e04663 + 9389d96
commit 94b134e
Show file tree

Hide file tree

Showing 5 changed files with 987 additions and 4,190 deletions.
diff --git a/.env b/.env
diff --git a/.gitignore b/.gitignore
@@ -29,6 +29,7 @@ yarn-error.*
 *.pem
 
 # local env files
+.env
 .env*.local
 
 # typescript