From c571fd4489e2d52383d75ed896b31ebc2775bdd0 Mon Sep 17 00:00:00 2001
From: lovezsh <lovezsh@noreply.localhost>
Date: Thu, 21 Mar 2024 19:50:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20README.md?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 2a50dbe..4abfe55 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,3 @@
-<<<<<<< HEAD
-# diskfifo
-
-=======
-### 简介
-
-一个简易的，数据持久化的FIFO队列
->>>>>>> 0390b96 (init)
+### 简介
+
+一个简易的，数据持久化的FIFO队列
\ No newline at end of file