Skip to content

Commit

Permalink
Fix broken merge conflict in .gitignore
Browse files Browse the repository at this point in the history
  • Loading branch information
@davehunt
davehunt committed Dec 5, 2017
1 parent 453a0e3 commit 99bc887
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,4 @@ __pycache__
.eggs
build
dist
<<<<<<< HEAD
Pipfile*
=======
*Pipfile*
>>>>>>> 6bda4e8... Fix command line argument ordering issue

0 comments on commit 99bc887

Please sign in to comment.