Fixed conflicts

2018-12-16 16:45:48 +05:30
parent d737e15c6b 0f443d3006
commit ea25895da1
310 changed files with 5235 additions and 1371 deletions
@@ -658,6 +658,12 @@
            <version>${suanshu.version}</version>
        </dependency>

+        <dependency>
+            <groupId>org.derive4j</groupId>
+            <artifactId>derive4j</artifactId>
+            <version>${derive4j.version}</version>
+            <optional>true</optional>
+        </dependency>
    </dependencies>

    <repositories>
@@ -881,6 +887,7 @@
        <fugue.version>4.5.1</fugue.version>
        <maven-bundle-plugin.version>3.3.0</maven-bundle-plugin.version>
        <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
+        <derive4j.version>1.1.0</derive4j.version>
    </properties>

 </project>