BAEL - 318 - resolving conflicts

2017-04-23 08:50:57 +01:00
parent 64f0428e00 300b9ab78d
commit f508eccfdc
14 changed files with 437 additions and 3 deletions
@@ -156,6 +156,7 @@
        <module>spring-mvc-tiles</module>
        <module>spring-mvc-velocity</module>
        <module>spring-mvc-web-vs-initializer</module>
+        <module>spring-mvc-webflow</module>
        <module>spring-mvc-xml</module>
        <module>spring-mvc-simple</module>
        <module>spring-security-openid</module>
@@ -253,4 +254,4 @@
            </extension>-->
        </extensions>
    </build>
-</project>
+</project>