delete accidentally added line to .gitignore during conflict resolve (#186)

55d94d780e
This commit is contained in:
Grigory Starinkin 2019-07-08 15:52:31 +01:00 committed by Byungjin Park
parent d88fe9141e
commit 4be6c213c8

1
.gitignore vendored
View file

@ -11,7 +11,6 @@
## Intermediate documents:
*.dvi
*-converted-to.*
<<<<<<< HEAD
### Editor ###
## Vim & Emacs temp files: