Merge .gitignore files

This commit is contained in:
Eelco Dolstra 2013-10-01 16:45:25 +02:00
parent c8628e0989
commit 95c98166ec
2 changed files with 1 additions and 2 deletions

1
.gitignore vendored
View file

@ -7,3 +7,4 @@ doc/NEWS.html
doc/NEWS.txt
doc/manual.html
doc/manual.pdf
.version-suffix

2
nixos/.gitignore vendored
View file

@ -1,2 +0,0 @@
*~
.version-suffix