merged gitignores

This commit is contained in:
Jan-Christoph Borchardt 2011-08-15 20:43:39 +02:00
parent 66576de1b7
commit 2f1a06b2ee
2 changed files with 1 additions and 2 deletions

1
.gitignore vendored
View File

@ -1,6 +1,7 @@
# the default generated dir + db file # the default generated dir + db file
data data
owncloud owncloud
config/config.php
# just sane ignores # just sane ignores
.*.sw[po] .*.sw[po]

2
config/.gitignore vendored
View File

@ -1,2 +0,0 @@
#autogenerated
config.php