#ignore things from transifex-client
venv/
-#ignore all in 'vendor' as `utils/composer.phar install` will bring it back
-vendor/*
-<<<<<<< HEAD
+#ignore Composer dependencies
+/vendor
+/view/asset
#ignore config files from JetBrains
/.idea
#ignore addons/ directory
addons/
-
-#Ignore .htaccess as it may contain local changes
-.htaccess
-=======
->>>>>>> Fixes for composer: