chenjunkai 5 жил өмнө
parent
commit
8da5fd56b3

+ 0 - 1
Controller/UserController.py

@@ -1528,7 +1528,6 @@ class wxAuthSignView(TemplateView):
             print(user_qs)
             return self.do_login(user_qs, response)
 
-<<<<<<< HEAD
 
 # 获取验证码
 class wxPerfectView(TemplateView):