From 0241f6e5f07905f85e4c0fbd9dc4d719f221023c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BB=B6=E7=9A=93?= <harvey_husky@foxmail.com>
Date: Wed, 8 Jan 2025 18:14:53 +0000
Subject: [PATCH] update README.md.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 延皓 <harvey_husky@foxmail.com>
---
 README.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index bb6fa0f..090ae3c 100644
--- a/README.md
+++ b/README.md
@@ -2,11 +2,9 @@
 
 为FZ服务器写的Minecraft生存辅助数据包
 
-<<<<<<< HEAD
+
 [![数据包版本](https://img.shields.io/badge/正式版-3.1.12-blue.svg)](https://gitee.com/harvey-husky/FZ-sDatapack/releases) [![MC版本](https://img.shields.io/badge/Minecraft-1.20+-blue.svg)](https://minecraft.net/)
-=======
-[![数据包版本](https://img.shields.io/badge/正式版-3.1.11-blue.svg)](https://gitee.com/harvey-husky/FZ-sDatapack/releases) [![MC版本](https://img.shields.io/badge/Minecraft-1.20|1.21+-blue.svg)](https://minecraft.net/)
->>>>>>> 82b1f0dcddcbfbb46d1ab272ded9c453531be507
+
 
 > 其他版本见[发行页面](https://gitee.com/harvey-husky/FZ-sDatapack/releases)