From 989a2c08009b275d9429a2086eb38307515641dd Mon Sep 17 00:00:00 2001
From: fengjiayi <12821976+ning_xi@user.noreply.gitee.com>
Date: Mon, 5 Aug 2024 10:22:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86readme.md?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index af7caf1..e208145 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,7 @@
-<<<<<<< HEAD
+
 一款基于WPF（Dotnet 8）的流程可视化编辑器（需二次开发）
+
 B站个人空间：https://space.bilibili.com/33526379
-第一次用git，不太懂
-=======
-B站个人空间：https://space.bilibili.com/33526379
-源代码在master分支
+
 ![image](https://github.com/fhhyyp/serein-flow/blob/main/%E6%95%88%E6%9E%9C%E5%9B%BE.png)
->>>>>>> 82453f79710ad298e60e269127421d512e240ea8
+