diff --git a/PriceSystem/ones_Sender.py b/PriceSystem/ones_Sender.py index 74be44f..9562b31 100644 --- a/PriceSystem/ones_Sender.py +++ b/PriceSystem/ones_Sender.py @@ -41,10 +41,5 @@ def get_weekend(tt): if __name__ == "__main__": weekend = "" -<<<<<<< HEAD send_cmd({"city": "西安", "region": "雁塔", "name": "鸿景花园", "weekend": get_weekend('20180325')}) #sys.exit(0) -======= - send_cmd({"city": "西安", "region": "未央", "name": "兴乐园", "weekend": get_weekend('20180325')}) - sys.exit(0) ->>>>>>> 4025e7533b2d0abe68b929bfb7d7c01b201fc112