Merge pull request #755 from ohmanger/patch-1

Ignore local.xml as this contains database credentials.
This commit is contained in:
Justin Spahr-Summers 2013-11-12 20:46:50 -08:00
commit 52ec58209b

View File

@ -37,6 +37,7 @@ app/etc/config.xml
app/etc/enterprise.xml app/etc/enterprise.xml
app/etc/local.xml.additional app/etc/local.xml.additional
app/etc/local.xml.template app/etc/local.xml.template
app/etc/local.xml
app/.htaccess app/.htaccess
app/locale/ app/locale/
app/Mage.php app/Mage.php