From 6f835e5703610f9f561fb152747ccae569aae563 Mon Sep 17 00:00:00 2001
From: zengxiaobin <you@example.com>
Date: Fri, 24 Nov 2023 17:18:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9gitignore?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index e662ff9..ae0f34e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,7 +45,6 @@ compile_commands.json
 CTestTestfile.cmake
 _deps
 
-<<<<<<< HEAD
 # ---> C
 # Prerequisites
 *.d
@@ -100,5 +99,3 @@ Module.symvers
 Mkfile.old
 dkms.conf
 
-=======
->>>>>>> 106e5595630b47a33778a4571588a9f739f6a80b