From 9307bf1f0b2a92fff8badf4f416d759b504e523d Mon Sep 17 00:00:00 2001
From: mharindu <milanharindu.ucsc@gmail.com>
Date: Mon, 16 May 2016 12:09:08 +0530
Subject: [PATCH] Fixed conflicts

---
 modules/distribution/src/repository/conf/cdm-config.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/modules/distribution/src/repository/conf/cdm-config.xml b/modules/distribution/src/repository/conf/cdm-config.xml
index 19a845e1..4ac277e3 100644
--- a/modules/distribution/src/repository/conf/cdm-config.xml
+++ b/modules/distribution/src/repository/conf/cdm-config.xml
@@ -57,10 +57,5 @@
 			</Operation>
 		</Operations>
 	</TaskConfiguration>
-	<DTDeploymentConfiguration>
-		<!-- Hostname and port of Device Type Management node goes here -->
-	        <DTHostAddress>localhost</DTHostAddress>
-	        <DTHostPort>9443</DTHostPort>
-	</DTDeploymentConfiguration>
 </DeviceMgtConfiguration>