delete accidentally added line to .gitignore during conflict resolve (#186)
55d94d780e
This commit is contained in:
parent
d88fe9141e
commit
4be6c213c8
1
.gitignore
vendored
1
.gitignore
vendored
@ -11,7 +11,6 @@
|
||||
## Intermediate documents:
|
||||
*.dvi
|
||||
*-converted-to.*
|
||||
<<<<<<< HEAD
|
||||
|
||||
### Editor ###
|
||||
## Vim & Emacs temp files:
|
||||
|
Loading…
x
Reference in New Issue
Block a user