diff --git a/.gitignore b/.gitignore
index b94947f..09d4870 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,8 @@ node_modules/
 
 # 忽略日志文件
 *.map
+<<<<<<< HEAD
 unpackage
+=======
+/unpackage
+>>>>>>> 8d926ab80051895aaa16b2352dec80b7bfb20516