From cdc24a73ca499b29b8ff2053a3369b5f7139dceb Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sun, 2 Apr 2017 21:29:06 +0200
Subject: [PATCH] Fixes for composer: - ./vendor/ is being prepared by
 executing `utils/composer.phar install`, no   need to have it around -
 converted .gitignore to LF line-ending (more common over the whole project) -
 no need to have them around ...

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

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