resolve merge conflicts

2020-01-16 02:07:06 +05:30
parent f004b3f4bc b315bf35c6
commit b4757ecc24
66 changed files with 343 additions and 157 deletions
--- a/java-numbers-2/pom.xml
+++ b/java-numbers-2/pom.xml
@@ -21,6 +21,11 @@
            <artifactId>jmh-generator-annprocess</artifactId>
            <version>${jmh-generator.version}</version>
        </dependency>
+        <dependency>
+            <groupId>it.unimi.dsi</groupId>
+            <artifactId>dsiutils</artifactId>
+            <version>${dsiutils.version}</version>
+        </dependency>
    </dependencies>

    <build>
@@ -33,4 +38,8 @@
        </resources>
    </build>

+    <properties>
+        <dsiutils.version>2.6.0</dsiutils.version>
+    </properties>
+
 </project>