解决冲突

This commit is contained in:
2018-04-02 14:46:55 +08:00
parent be2f9f23a0
commit e4b1ed00df
-4
View File
@@ -273,11 +273,7 @@ def dis_feature(query, fields=None):
# db1 = client1.fangjia
# dsf = db1.average_statistics
# s = time.time()
<<<<<<< HEAD
seawater105 = get_collection("fangjia_stat", "district_feature",config.get_mongodb_host(), 27017)
=======
seawater105 = get_collection("fangjia_stat", "district_feature", config.get_mongodb_host(), config.get_mongodb_port())
>>>>>>> 09017dda8ec82bf1b4eea67648f8c33417df32f7
for err_count in range(0, 10):
try: