1 changed files with 0 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -14,10 +14,7 @@
 /build
 */build
 /src/authtoken.json
-<<<<<<< HEAD
-=======

->>>>>>> dev
 # misc
 .DS_Store
 .env.local