From 95a7ff6aafc59baa645e2463aed48c43e2111ac8 Mon Sep 17 00:00:00 2001 From: Hasunie Date: Tue, 17 Jan 2017 16:48:10 +0530 Subject: [PATCH] fixing windows app-conf issue --- .../jaggeryapps/windows-web-agent/app/conf/app-conf.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/app-conf.json b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/app-conf.json index d8357c866..ea1f69b67 100755 --- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/app-conf.json +++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/app-conf.json @@ -38,13 +38,8 @@ }, "generalConfig" : { "host" : "https://localhost:9443", -<<<<<<< HEAD - "companyName" : "WSO2 IOTS", - "browserTitle" : "WSO2 IOT", -======= "companyName" : "WSO2 IoT Server", "browserTitle" : "WSO2 IoT Server", ->>>>>>> 05e2cb7bb8db033166a81e327d1c82c83a5a8178 "copyrightPrefix" : "\u00A9 %date-year%, ", "copyrightOwner" : "WSO2 Inc.", "copyrightOwnersSite" : "http://www.wso2.org",