From e9bddf13d929f33206ff478e6a0461ded4d12a6b Mon Sep 17 00:00:00 2001 From: NuwanSameera Date: Mon, 14 Dec 2015 19:40:19 +0530 Subject: [PATCH] digital display p2.inf changes --- .../private/conf/device-type.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digitaldisplay.type-view/private/conf/device-type.json b/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digitaldisplay.type-view/private/conf/device-type.json index d6ed970717..5abc248f05 100644 --- a/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digitaldisplay.type-view/private/conf/device-type.json +++ b/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digitaldisplay.type-view/private/conf/device-type.json @@ -1,13 +1,8 @@ { "deviceType": { -<<<<<<< HEAD "label": "Digital Display", "category": "iot", "downloadAgentUri": "http://localhost:9763/digital_display/manager/device/device_display/download" -======= - "displayName": "Digital Display", - "category" : "iot" ->>>>>>> upstream/IoTS-1.0.0-M1 } }