Merge pull request github#755 from ohmanger/patch-1

Ignore local.xml as this contains database credentials.
u9E9F · Nov 13, 2013 · 7f6448e · 7f6448e
2 parents 2c2a23a + d9fd3ea
commit 7f6448e
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/Magento.gitignore b/Magento.gitignore
@@ -37,6 +37,7 @@ app/etc/config.xml
 app/etc/enterprise.xml
 app/etc/local.xml.additional
 app/etc/local.xml.template
+app/etc/local.xml
 app/.htaccess
 app/locale/
 app/Mage.php