Windows' CRLF are looking strange under Linux, let's get rid of them/

Also let's ignore addons/ as it is optional and depend on if the webmaster
wants it or not.

Signed-off-by: Roland Häder <roland@mxchange.org>

.gitignore

@@ -56,7 +56,6 @@ venv/
 
 #ignore all in 'vendor' as `utils/composer.phar install` will bring it back
 vendor/*
-<<<<<<< HEAD
 
 #ignore config files from JetBrains
 /.idea
@@ -66,5 +65,3 @@ addons/
 
 #Ignore .htaccess as it may contain local changes
 .htaccess
-=======
->>>>>>> Fixes for composer: