Merge branch 'master' of https://github.com/sepehr/gitignore into sepehr-master

1f0cc1d4 · Chris Wanstrath · 0c33736c · 6dc2f0a1 · 1f0cc1d4 · 1f0cc1d4
Commit 1f0cc1d4 authored Feb 22, 2011 by Chris Wanstrath
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

Drupal.gitignore Drupal.gitignore +0 -1

ZendFramework.gitignore ZendFramework.gitignore +6 -0

No files found.
--- a/Drupal.gitignore
+++ b/Drupal.gitignore
@@ -3,7 +3,6 @@ sites/default/private
 sites/default/settings.php
 cache/
 files/
-settings.php
 /README.txt
 /CHANGELOG.txt
 /COPYRIGHT.txt

--- a/ZendFramework.gitignore
+++ b/ZendFramework.gitignore
+INSTALL.txt
+LICENSE.txt
+README.txt
+demos/
+extras/documentation
+