Resolve conflicts manually

2017-11-27 12:05:18 +05:30
parent 043ea5e574
commit b1782b3c19
1 changed files with 5 additions and 0 deletions
@@ -587,6 +587,11 @@
            <artifactId>hazelcast</artifactId>
            <version>${hazelcast.version}</version>
        </dependency>
        <dependency>
            <groupId>org.jgrapht</groupId>
            <artifactId>jgrapht-core</artifactId>
            <version>1.0.1</version>
        </dependency>
        <dependency>
            <groupId>com.netopyr.wurmloch</groupId>
            <artifactId>wurmloch-crdt</artifactId>