X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=.gitignore;h=114bb5dbb9a5054ca0d1c71fcdb054979c15a176;hb=0b38f1c58b822ac1ec5a199de00f0a0631c01a61;hp=c31d8c5b5b1df0068531cf05e9a315a98e07d1c2;hpb=cdc24a73ca499b29b8ff2053a3369b5f7139dceb;p=friendica.git

diff --git a/.gitignore b/.gitignore
index c31d8c5b5b..114bb5dbb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,20 +2,22 @@ favicon.*
 .htconfig.php
 .htpreconfig.php
 \#*
-include/jquery-1.4.2.min.js
 *.log
 *.out
 *.version*
-favicon.*
 home.html
-addon
+
 *~
 robots.txt
 
+#ignore local config
+/config/local.ini.php
+/config/addon.ini.php
+
 #ignore documentation, it should be newly built
-doc/html
+/doc/html
 
-#ignore reports, should be generted with every build
+#ignore reports, should be generated with every build
 report/
 
 #ignore config files from eclipse, we don't want IDE files in our repository
@@ -54,17 +56,13 @@ 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:
+#ignore addons directory
+/addons
+/addon
\ No newline at end of file