|
|
@@ -333,33 +333,6 @@
|
|
|
* Settings specific to testing builds.
|
|
|
*/
|
|
|
"testing": {
|
|
|
-<<<<<<< HEAD
|
|
|
-=======
|
|
|
- "output": {
|
|
|
- "appCache": {
|
|
|
- "enable": true,
|
|
|
- "path": "cache.appcache"
|
|
|
- }
|
|
|
- },
|
|
|
- "loader": {
|
|
|
- "cache": "${build.timestamp}"
|
|
|
- },
|
|
|
- "cache": {
|
|
|
- "enable": true
|
|
|
- },
|
|
|
- "compressor": {
|
|
|
- "type": "yui"
|
|
|
- },
|
|
|
- "server": {
|
|
|
- "accountCenter": "https://saas-test.usoftchina.com:5443",
|
|
|
- "accountEnterprise": "https://saas-test.usoftchina.com:5443/#/enterprise",
|
|
|
- "basePath": {
|
|
|
- "https": "https://saas-api-test.usoftchina.com:5443",
|
|
|
- "http": "http://192.168.0.181:8575"
|
|
|
- },
|
|
|
- "urlPattern": "^\/api\/"
|
|
|
- }
|
|
|
->>>>>>> 72c13d51e13b1995ba9a9c6c10cbd591ea51e460
|
|
|
},
|
|
|
|
|
|
/**
|
yingp