Check for bans and partially working num replies

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