first commit

2023-03-11 19:46:22 +08:00 · 2023-03-11 19:46:22 +08:00 · d4c17113c4
commit d4c17113c4
--- 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