@@ -44,13 +44,6 @@ import gSlide
import aiofiles
import json
import util.user
-<<<<<<< HEAD
-=======
-pymysql.install_as_MySQLdb()
-
-db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/AI_anchor?charset=utf8mb4')
-app = FastAPI()
->>>>>>> cd4d249dd3f9ce4ac8b8f478c96659235223d10f
pymysql.install_as_MySQLdb()
app = FastAPI()