From 0b8192784ca292ca9cdce328ba39ff29e92c1864 Mon Sep 17 00:00:00 2001
From: Ctrlcvs <1509167646@qq.com>
Date: Fri, 17 Jun 2022 14:51:28 +0000
Subject: [PATCH] update README.md.

---
 README.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 6cd411c..46034b4 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,13 @@
-<<<<<<< HEAD
-# genshin-image
-
 #### 介绍
-=======
 # cvs-plugin
 
 介绍
->>>>>>> b86b60eace7bda4f73816896045225af3fd548a0
+# genshin-image
+
+#### 介绍
+# cvs-plugin
+
+介绍
 原神图鉴分类管理仓库。
 
 #### 软件架构