From 86d6f195284dc6573fa8e3269cde830e1d9d445a Mon Sep 17 00:00:00 2001
From: renjianbo <263303411@qq.com>
Date: Thu, 5 Oct 2023 01:06:17 +0800
Subject: [PATCH] =?UTF-8?q?python=E5=AD=A6=E4=B9=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/base_setting.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/config/base_setting.py b/config/base_setting.py
index aaa975d..cae7190 100644
--- a/config/base_setting.py
+++ b/config/base_setting.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-SERVER_PORT = 8999
+SERVER_PORT = 8998
 DEBUG = False
 SQLALCHEMY_ECHO = False
 
@@ -44,13 +44,7 @@ UPLOAD = {
 
 APP = {
     # 'domain':'http://106.52.204.179:8999'
-<<<<<<< HEAD
        'domain':'https://python815.cn'
-=======
-
-
->>>>>>> 86554b9ce9fff07f8fcb5b67a271976c08d3b684
-
 }
 
 PAY_STATUS_MAPPING = {