From 99dab6419970508d5390ec1df6e60c7c1772b3b3 Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Thu, 18 Oct 2018 12:52:08 +0200
Subject: [PATCH] Update gitignore

---
 .gitignore | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3831df82..73ce2639 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,4 @@
 vas/
 client/
-<<<<<<< HEAD
 conf/
 src/closure/
-=======
-conf/closure
-conf/node_modules/
-conf/properties.json
-src/closure/conf/depswriter/
->>>>>>> 05269f92990d0e0fd0c2fc1d62f823e6a17bd473
-- 
GitLab