[BAEL-9712] - Fixed conflicts

2018-11-25 00:18:37 +05:30
parent 96d121bcae 80566a89cc
commit e9fa7851a5
101 changed files with 3504 additions and 709 deletions
@@ -31,9 +31,8 @@
        </dependency>
        <dependency>
            <groupId>org.thymeleaf.extras</groupId>
-            <artifactId>thymeleaf-extras-springsecurity5</artifactId>
+            <artifactId>thymeleaf-extras-springsecurity4</artifactId>
        </dependency>
-
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-test</artifactId>