|
|
@@ -15,9 +15,6 @@ module.exports = {
|
|
|
useMongoClient: true
|
|
|
}
|
|
|
},
|
|
|
-<<<<<<< HEAD
|
|
|
- pp:{ server: "172.18.111.231",
|
|
|
-=======
|
|
|
qa_outer: {
|
|
|
server: "smartcost.in.8866.org",
|
|
|
port: "26904",
|
|
|
@@ -32,8 +29,7 @@ module.exports = {
|
|
|
},
|
|
|
importURL:"192.168.1.184:6050"
|
|
|
},
|
|
|
- pp:{ server: "112.74.42.187",
|
|
|
->>>>>>> f60eae7d43d9b60ca03ff1f2d956e0d7fe79ac6a
|
|
|
+ pp:{ server: "172.18.111.231",
|
|
|
port: "27017",
|
|
|
options:{
|
|
|
user:'smartcost',
|
|
|
@@ -84,4 +80,4 @@ module.exports = {
|
|
|
}
|
|
|
},
|
|
|
pageSize: 20
|
|
|
-};
|
|
|
+};
|
