diff --git a/src/DjangoBlog-master(1)/DjangoBlog-master/oauth/apps.py b/src/DjangoBlog-master(1)/DjangoBlog-master/oauth/apps.py
index 637f7a3..6f97c46 100644
--- a/src/DjangoBlog-master(1)/DjangoBlog-master/oauth/apps.py
+++ b/src/DjangoBlog-master(1)/DjangoBlog-master/oauth/apps.py
@@ -2,7 +2,6 @@ from django.apps import AppConfig
 
 
 class OauthConfig(AppConfig):
-<<<<<<< HEAD
     """
     OAuth应用配置类
     用于配置Django中OAuth应用的元数据和启动行为
@@ -14,6 +13,4 @@ class OauthConfig(AppConfig):
     # 指定应用的Python路径，Django使用这个名称来识别应用
     # 这应该与应用目录的名称保持相同
     name = 'oauth'
-=======
-    name = 'oauth'
->>>>>>> ccy_branch
+