Skip to content

Commit

Permalink
chore: remove confliction typo
Browse files Browse the repository at this point in the history
  • Loading branch information
@rhiokim
rhiokim committed Apr 18, 2017
1 parent 63281d0 commit 466e9fa
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,6 @@ v8.log

# flowtype
flow-typed/npm
<<<<<<< HEAD
<<<<<<< HEAD

# nyc (istanbul cli)
.nyc_output
=======
>>>>>>> 3d360aaa494d1622171461e9190606d8727fb563
=======
>>>>>>> 3d360aaa494d1622171461e9190606d8727fb563

0 comments on commit 466e9fa

Please sign in to comment.