Merge pull request #17 from lmcgartland/test_for_travis_ci_build

removed merge conflicts in .gitignore
lmcgartland · Sep 30, 2018 · 569853c · 569853c
2 parents 12badd8 + c5272ed
commit 569853c
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -103,10 +103,6 @@ ENV/
 # IDE
 .idea/
 
-<<<<<<< HEAD
+
 #pytest
 .pytest_cache
-=======
-# py.test
-.pytest_cache/
->>>>>>> b281502b87963207149eee175497f9fa85b848d7