delete accidentally added line to .gitignore during conflict resolve

55d94d780e
This commit is contained in:
Grigory Starinkin 2018-01-03 22:17:30 +00:00
parent e35c51720e
commit b415cb5949
No known key found for this signature in database
GPG key ID: 6A32D1F8AB4C166A

1
.gitignore vendored
View file

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