Commit c35d98af authored by 高雅喆's avatar 高雅喆

fixed confilct

parent e87ced70
......@@ -28,7 +28,3 @@
#5.requirements:
python==3.4.3
pymysql==0.9.2
#6.git revert test1
#6.1 git revert test2
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment