From b1782b3c19c3f4e3eef2a976efa23ad066d28e00 Mon Sep 17 00:00:00 2001
From: "parth.karia" <parthkaria.92@gmail.com>
Date: Mon, 27 Nov 2017 12:05:18 +0530
Subject: [PATCH] Resolve conflicts manually

---
 libraries/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libraries/pom.xml b/libraries/pom.xml
index 0b707b914e..27d867b68b 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -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>