From cd31c45e9ae957f1969059f4f122012901694cce Mon Sep 17 00:00:00 2001
From: linbenlei <572833793@qq.com>
Date: Thu, 29 Jul 2021 16:25:21 +0800
Subject: [PATCH] dev

---
 1.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/1.txt b/1.txt
index 83b5996..192db5a 100644
--- a/1.txt
+++ b/1.txt
@@ -14,10 +14,10 @@ qq4
 fe3
 fe4
 
-<<<<<<< HEAD
-dev3
+
+dev3 dev为根
 dev4
-=======
+
 fe5
 fe6
->>>>>>> 6d8dcf8c346aa4c50da9f24989c00cd091e5b1d2
+
--
libgit2 0.21.2