fixing windows app-conf issue

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",