remove merge conflict

mozilla · Mar 7, 2018 · d78b731 · d78b731
1 parent 8c048fa
commit d78b731
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,12 +1,9 @@
 tags
 *.py[co]
-<<<<<<< HEAD
 .*
 MANIFEST
 dist/*
-=======
 agithub.egg-info/
 agithub.egg-info/
 build/
 dist/
->>>>>>> 285837c353eefb12723de23117b952f126a6ce92