index冲突解决

607af612 · 华国豪 · 3399c4f1 · 607af612
Commit 607af612 authored Mar 11, 2019 by 华国豪 🙄
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

index.js src/plug/index.js +1 -4

No files found.
--- a/src/plug/index.js
+++ b/src/plug/index.js
@@ -115,11 +115,8 @@ export default {
      Vue.prototype.domainManager = function () {
      let domainUrl = '';
      let locationName = window.location.hostname;
-<<<<<<< HEAD
-      domainUrl = "http://192.168.2.65:8025"; //214主域名
-=======
+      // domainUrl = "http://192.168.2.65:8025"; //214主域名
      domainUrl = "http://192.168.2.214:8082"; //214主域名
->>>>>>> 7b8479755cbf4d14d1c76d3cc81fe02bca102d72
      if (locationName.indexOf('oytour')!==-1) {
        domainUrl = "http://reborn.oytour.com";
     }