From 702c93266c2933239081d9387a00c0891b4f1e79 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Fri, 27 Sep 2019 11:51:48 +0200
Subject: [PATCH] Fixed ignore file

---
 src/main/.gitignore | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/.gitignore b/src/main/.gitignore
index 6bb99d3..85393fc 100644
--- a/src/main/.gitignore
+++ b/src/main/.gitignore
@@ -1,5 +1 @@
-<<<<<<< HEAD
 webapp/
-=======
-webapp
->>>>>>> refs/remotes/origin/feature/16359