fix conflict

This commit is contained in:
-
2019-04-07 23:25:06 -06:00
57 changed files with 2004 additions and 604 deletions
@@ -1,2 +0,0 @@
spring.mvc.view.prefix:/WEB-INF/jsp/
spring.mvc.view.suffix:.jsp