Fixed ignore file

2019-09-27 11:51:48 +02:00 · 2019-09-27 11:51:48 +02:00 · 702c93266c
parent 6e3f89992b
commit 702c93266c
1 changed files with 0 additions and 4 deletions
--- a/src/main/.gitignore
+++ b/src/main/.gitignore
@ -1,5 +1 @@
-<<<<<<< HEAD
 webapp/
-=======
-webapp
->>>>>>> refs/remotes/origin/feature/16359