冲突修正

fengxiang

2018-03-13 936bb39145eee86530f61d3345f8125ddd778225

 src/environments/environment.hmr.ts

@@ -3,5 +3,6 @@
    SERVER_URL: `./`,
    production: false,
    hmr: true,
    useHash: true
    useHash: true,
    SERVER_BASH_URL: `http://47.96.171.62:8080/screen_api_v2/`
};