community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing windows app-conf issue

Browse Source
This commit is contained in:
Hasunie 2017-01-17 16:48:10 +05:30
parent e030be3d24
commit 95a7ff6aaf
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
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
View File

@ -38,13 +38,8 @@
}, },
"generalConfig" : { "generalConfig" : {
"host" : "https://localhost:9443", "host" : "https://localhost:9443",
<<<<<<< HEAD
"companyName" : "WSO2 IOTS",
"browserTitle" : "WSO2 IOT",
=======
"companyName" : "WSO2 IoT Server", "companyName" : "WSO2 IoT Server",
"browserTitle" : "WSO2 IoT Server", "browserTitle" : "WSO2 IoT Server",
>>>>>>> 05e2cb7bb8db033166a81e327d1c82c83a5a8178
"copyrightPrefix" : "\u00A9 %date-year%, ", "copyrightPrefix" : "\u00A9 %date-year%, ",
"copyrightOwner" : "WSO2 Inc.", "copyrightOwner" : "WSO2 Inc.",
"copyrightOwnersSite" : "http://www.wso2.org", "copyrightOwnersSite" : "http://www.wso2.org",