Fixed ignore file
This commit is contained in:
parent
6e3f89992b
commit
702c93266c
|
@ -1,5 +1 @@
|
||||||
<<<<<<< HEAD
|
|
||||||
webapp/
|
webapp/
|
||||||
=======
|
|
||||||
webapp
|
|
||||||
>>>>>>> refs/remotes/origin/feature/16359
|
|
||||||
|
|
Loading…
Reference in New Issue