From d4c17113c47322f7d379ce1b56a8571b7d235200 Mon Sep 17 00:00:00 2001
From: Zhen Liu <zhen@MacBook-Pro-von-Zhen.local>
Date: Sat, 11 Mar 2023 19:46:22 +0800
Subject: [PATCH] first commit

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

diff --git a/.gitignore b/.gitignore
index 6309e0f..b6e4761 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,3 @@
-<<<<<<< HEAD
-__pycache__
-=======
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -130,4 +127,3 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
->>>>>>> 0755e60e97dfcaf72aa397a7dd807819692dc314