BAEL-995: resolved merge issues (#2255)

2017-07-13 12:02:05 +05:00
parent 84956990b6
commit 78de955aac
3 changed files with 71 additions and 0 deletions
@@ -331,6 +331,11 @@
            <artifactId>datanucleus-xml</artifactId>
            <version>5.0.0-release</version>
        </dependency>
+        <dependency>
+            <groupId>net.openhft</groupId>
+            <artifactId>chronicle</artifactId>
+            <version>3.6.4</version>
+        </dependency>
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-web</artifactId>