d

bigdata/app/config/localsettings.js

@@ -10,13 +10,8 @@ var settings = {
     user: "root",
     password: "123456",
     config: {
-<<<<<<< HEAD
-      host: '192.168.4.119',
-      port: 3306,
-=======
       host: '43.247.184.35',
       port: 8899,
->>>>>>> 5315b1038a0ea78ef8d6584e1c774432afe365d1
       dialect: 'mysql',
       operatorsAliases: false,
       pool: {