ADAP-142: merge conflict

wenjunche · wenjunche · commit 8a6d680bd707 · 2019-03-10T14:28:31.000-04:00
diff --git a/pom.xml b/pom.xml
@@ -58,11 +58,7 @@
         <dependency>
             <groupId>co.openfin</groupId>
             <artifactId>openfin-desktop-java-adapter</artifactId>
-<<<<<<< HEAD
-            <version>7.0.2</version>
-=======
             <version>7.1.1-SNAPSHOT</version>
->>>>>>> develop
         </dependency>
         <dependency>
             <groupId>co.openfin</groupId>
