From 15c570495b000fa2cf3a515f896a154feb4ffc90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 26 Jul 2017 22:16:29 +0200
Subject: [PATCH] Windows' CRLF are looking strange under Linux, let's get rid
 of them/
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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 | 3 ---
 1 file changed, 3 deletions(-)

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: