Merge pull request #755 from ohmanger/patch-1

jspahrsummers · jspahrsummers · commit 52ec58209bd6 · 2013-11-12T20:46:50.000-08:00
Ignore local.xml as this contains database credentials.
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
