diff --git a/.gitignore b/.gitignore
index 0ab206269..95d26b6bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,4 +32,11 @@
 #docker
 /docker/mysql/data/*
 /docker/mysql/log/*
+<<<<<<< HEAD
 .DS_Store
+=======
+>>>>>>> 445c2b9e8 (fix(workerman): 统一 workerman/timer 运行时文件到 runtime 目录)
+
+#docker
+/docker/mysql/data/*
+/docker/mysql/log/*