digital display p2.inf changes

9 years ago · e9bddf13d9
parent 91de097713
commit e9bddf13d9
1 changed files with 0 additions and 5 deletions
--- 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
  }
 }