.gitignore

#--------------------------#
# Magento Default Files    #
#--------------------------#

/.buildpath
/.cache
/.metadata
/.project
/.settings
atlassian*
/nbproject
/sitemap
/.idea
/.gitattributes

/app/etc/local.xml
/app/etc/env.php

/dev/shell
/dev/tests/*/framework
/dev/tests/*/testsuite/Magento
/dev/tests/*/tmp
/dev/tests/*/etc
/dev/tests/*/*.*
/dev/tests/*.*
/dev/tests/api-functional/config
/dev/tests/api-functional/_files/Magento
/dev/tests/js/JsTestDriver/framework
/dev/tests/js/JsTestDriver/testsuite/lib
/dev/tests/js/JsTestDriver/testsuite/mage
/dev/tests/js/JsTestDriver/*.*
/dev/tests/js/jasmine/assets
/dev/tests/js/jasmine/spec_runner
/dev/tests/js/jasmine/tests/app/code/Magento
/dev/tests/js/jasmine/tests/lib/mage
/dev/tests/js/jasmine/*.*
/dev/tests/performance
/dev/tests/functional/lib/Magento
/dev/tests/functional/tests/app/Magento
/dev/tests/functional/testsuites/Magento
/dev/tests/functional/utils
/dev/tools/Magento
/dev/tools/grunt
/dev/tools/*.*

/dev/*.*

<<<<<<< HEAD

/pub
/setup
/var
=======
/pub
/setup
/var

>>>>>>> github/master

!/composer.json
!/composer.lock
!/README.md

/media/
/skin/

.modgit/
app/etc/config.xml
app/etc/enterprise.xml
app/etc/local.xml.additional
app/etc/local.xml.template
/cron.php
/cron.sh
downloader/
errors/
favicon.ico
get.php
pear
pear/
php.ini.sample
pkginfo/
RELEASE_NOTES.txt
shell/abstract.php
shell/compiler.php
shell/indexer.php
shell/log.php
.ftpquota
/api.php
bridge.php
bridge1.php
error_log
robots.txt
sm_config.php
sm_tunnel.php
/.idea/
/sitemap.xml
thubservice.php
thubtest.html
/corteclean
dwsync.xml\nThumbs.db\n
*_notes/
sql/
sql/backup/
media/webforms/
et --merge ORIG_HEAD
help
feeds/
mail/
stage/
tmp/
dev2/
dev3/
live/
nginx.conf.sample
package.json.sample
Gruntfile.js.sample