#84 Fix merge errors

This commit is contained in:
Ilkka Seppala committed 2015-08-15 21:06:31 +03:00
1 parent 072a885ec8
commit 61b1c426ef
3 files changed
+45

No files matched your search

+1
View File
@@ -74,6 +74,7 @@
<module>business-delegate</module>
<module>half-sync-half-async</module>
<module>step-builder</module>
<module>layers</module>
</modules>
<dependencyManagement>