[BAEL-8472] - Resolved conflict

2018-09-09 11:01:53 +05:30
parent 12124f30cb
commit 9e2a18a6d5
29 changed files with 463 additions and 12 deletions
@@ -352,6 +352,7 @@
 				<module>java-streams</module>
                <module>core-java-persistence</module>
 				<module>core-kotlin</module>
+				<module>kotlin-libraries</module>
 				<module>core-groovy</module>
 				<module>core-java-concurrency</module>
 				<module>core-java-concurrency-collections</module>
@@ -1240,6 +1241,7 @@
                <module>spring-boot-ops</module>
                <module>spring-5</module>
                <module>core-kotlin</module>
+				<module>kotlin-libraries</module>
                <module>core-java</module>
                <module>google-web-toolkit</module>
                <module>spring-security-mvc-custom</module>