From a93f105b814cad44ec1deb72ffc1d192bd2d3720 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Wed, 28 Nov 2018 15:03:52 +0100
Subject: [PATCH] Merge branch 'next_version'

---
 .gitignore | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 98ef169d..00000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-web_service/conf/properties*
-web_service/conf/version.inc
-- 
GitLab