From 34eb7096c11919ce043c1ca10532f6cab1c0b918 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?SharwOrange=E6=A9=99=E5=A4=9C?= <kuliangcha@qq.com>
Date: Sun, 31 Dec 2023 01:28:03 +0000
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitignore?=
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 dce0c1f..e5fcef8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,5 @@
 config.toml
 .vs
 .vscode
-<<<<<<< HEAD
 .idea
-=======
 __pycache__
->>>>>>> 51011ec401ee07fe7446b24fad680a629e12ff56