Skip to content

Commit

Permalink
removed merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@lmcgartland
lmcgartland committed Sep 30, 2018
1 parent 12badd8 commit c5272ed
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,6 @@ ENV/
# IDE
.idea/

<<<<<<< HEAD

#pytest
.pytest_cache
=======
# py.test
.pytest_cache/
>>>>>>> b281502b87963207149eee175497f9fa85b848d7

0 comments on commit c5272ed

Please sign in to comment.