Fixing local vs remote differences

pavelmc · Feb 9, 2018 · bc5a6bc · bc5a6bc
2 parents efb00f4 + 95b7ed7
commit bc5a6bc
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,7 @@
 .amake
+<<<<<<< HEAD
 .gch
 ~*
 
+=======
+>>>>>>> 95b7ed7323809929eba7b3b2a5185d73b4242877