合并冲突

Change-Id: I3b6ac5ae87aad8fe746eceecc8f92fc5574b50a8
diff --git a/.gitignore b/.gitignore
index e59017b..df22f1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,6 @@
 .eslintcache
 
 pnpm-lock.yaml
+.lingma
+
+ZYTTodo