diff --git a/src/utils/mqttConfig.js b/src/utils/mqttConfig.js
index 9145f35..f7ffab1 100644
--- a/src/utils/mqttConfig.js
+++ b/src/utils/mqttConfig.js
@@ -40,11 +40,7 @@ class mqttHandle {
         //配置链接
         const { host, port, endpoint, ...options } = this.connect;
         console.log("this.connect.host",this.connect.host)
-<<<<<<< HEAD
         const connectUrl = 'ws://175.27.191.156:10083/mqtt';
-=======
-        const connectUrl = 'ws://175.27.191.156:10083/mgtt';
->>>>>>> 006ce36a7cef616fdc714ec5799317b9668c98bb
         // const connectUrl = `ws://${this.connect.host}:${this.connect.port}`;
         // if (!client.connected) {
         //     client.on('connect', function () {