From 2de47c779e80efae06be508dbc5809875bc2203c Mon Sep 17 00:00:00 2001
From: djq <1092424998@qq.com>
Date: Sun, 23 Nov 2025 15:15:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=89=80=E6=9C=89=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/DjangoBlog-master(1)/DjangoBlog-master/oauth/apps.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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
+