Fixed & added unittests

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index c31d8c5b5b1df0068531cf05e9a315a98e07d1c2..de0fbc3d76c2774d4ef8ea1774aa1a25b6b42ca2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -54,17 +54,12 @@ nbproject
 #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: