From: Roland Häder <roland@mxchange.org>
Date: Wed, 26 Jul 2017 20:16:29 +0000 (+0200)
Subject: Windows' CRLF are looking strange under Linux, let's get rid of them/
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=15c570495b000fa2cf3a515f896a154feb4ffc90;hp=3868d830e78c9e3ad5e067c4bd07f4c5cad436c4;p=friendica.git

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>
---

diff --git a/.gitignore b/.gitignore
index c31d8c5b5b..12dd3b49ea 100644
--- a/.gitignore
+++ b/.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: