Skip to content

Commit

Permalink
delete accidentally added line to .gitignore during conflict resolve (p…
Browse files Browse the repository at this point in the history 
…osquit0#186)

posquit0@55d94d7
  • Loading branch information
@velimir @posquit0
velimir authored and posquit0 committed Jul 8, 2019
1 parent d88fe91 commit 4be6c21
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
## Intermediate documents:
*.dvi
*-converted-to.*
<<<<<<< HEAD

### Editor ###
## Vim & Emacs temp files:
Expand Down

0 comments on commit 4be6c21

Please sign in to comment.