From bbae97a92b841c30a8365dafb247b92aac4906a7 Mon Sep 17 00:00:00 2001
From: lasantha <tcdlpds@gmail.com>
Date: Wed, 15 Nov 2017 17:15:58 +0530
Subject: [PATCH] resolve merging conflicts

---
 pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index e0561dcd0e0..3359e9412f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1869,11 +1869,7 @@
         <axiom.wso2.version>1.2.11.wso2v10</axiom.wso2.version>
 
         <!-- Carbon Device Management -->
-<<<<<<< HEAD
         <carbon.device.mgt.version>3.0.170</carbon.device.mgt.version>
-=======
-        <carbon.device.mgt.version>3.0.173-SNAPSHOT</carbon.device.mgt.version>
->>>>>>> 1b8ecafce5df8cf9f234e6877c6ec2142ffe23d0
 
         <!-- Carbon Commons -->
         <carbon.commons.version>4.4.8</carbon.commons.version>