[BUGFIX] .htaccess: Rename file

[friendica.git] / .gitignore

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