commit

4 years ago · 4fba9b6a27
parent d191543da7
commit 4fba9b6a27
1 changed files with 0 additions and 4 deletions
--- a/app.py
+++ b/app.py
@ -157,8 +157,4 @@ def dcard_dev():


 if __name__ == "__main__":
-<<<<<<< HEAD
    app.run(debug=False, port=4980, host='0.0.0.0', threaded=True)
-=======
-    app.run(debug=False, port=4998, host='0.0.0.0', threaded=True)
->>>>>>> dev/addPush