Fun with git

MissionVistaCS · Apr 8, 2018 · d9933d4 · d9933d4
1 parent 511b12d
commit d9933d4
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,10 +2,7 @@ node_modules/
 .idea/
 *.log.*
 uploads/
-<<<<<<< HEAD
 dist/
-=======
->>>>>>> ebbb570f89e87134730dca884691f902d5e49736
 package-lock.json
 *~
 .DS_Store