From 4fba9b6a27eca4c0fb87359c93597e9ab3054a68 Mon Sep 17 00:00:00 2001
From: Zovjsra <4703michael@gmail.com>
Date: Wed, 7 Oct 2020 09:22:44 +0800
Subject: [PATCH] commit

---
 app.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app.py b/app.py
index 23b878a..c36232f 100755
--- 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