From 9691c9b97d05ba287c25a6dda369efdc4f63ae5b Mon Sep 17 00:00:00 2001
From: maojian <maojian@qq.com>
Date: Tue, 7 Jan 2025 16:49:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'README.md'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 87620fe..4e5c230 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1 @@
-<<<<<<< HEAD
-智谱大模型应用
-=======
-<<<<<<< HEAD
-应用管理中心
-=======
-# appliction_manager
-
-sba应用管理
->>>>>>> branch 'master' of http://82.156.111.58:3000/maojian/appliction_manager.git
->>>>>>> branch 'master' of http://82.156.111.58:3000/maojian/appliction_manager.git
+sba应用管理
\ No newline at end of file