Resolve conflicts manually

This commit is contained in:
parth.karia 2017-11-27 12:05:18 +05:30
parent 043ea5e574
commit b1782b3c19

View File

@ -587,6 +587,11 @@
<artifactId>hazelcast</artifactId> <artifactId>hazelcast</artifactId>
<version>${hazelcast.version}</version> <version>${hazelcast.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.jgrapht</groupId>
<artifactId>jgrapht-core</artifactId>
<version>1.0.1</version>
</dependency>
<dependency> <dependency>
<groupId>com.netopyr.wurmloch</groupId> <groupId>com.netopyr.wurmloch</groupId>
<artifactId>wurmloch-crdt</artifactId> <artifactId>wurmloch-crdt</artifactId>