Fixes for composer:

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 12dd3b49ea772ae0129944dc48c8811ed0da6326..c31d8c5b5b1df0068531cf05e9a315a98e07d1c2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -56,6 +56,7 @@ venv/
 
 #ignore all in 'vendor' as `utils/composer.phar install` will bring it back
 vendor/*
+<<<<<<< HEAD
 
 #ignore config files from JetBrains
 /.idea
@@ -65,3 +66,5 @@ addons/
 
 #Ignore .htaccess as it may contain local changes
 .htaccess
+=======
+>>>>>>> Fixes for composer: