From 8ffac5e35940d6373a06957921ee4bb1b3b3452c Mon Sep 17 00:00:00 2001
From: wdt <2134772300@qq.com>
Date: Mon, 16 Dec 2024 17:52:38 +0800
Subject: [PATCH] change readme

---
 README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index a3fbb4b..9c32d65 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
-<<<<<<< HEAD
-# 苍穹外卖
 
 #### 介绍
-黑马苍穹外卖项目源码，已完结
+外卖项目源码
 
 #### 软件架构
 软件架构说明