github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-28 13:31:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(.gitignore): 移除冲突标记和多余的 .DS_Store 规则

Browse Source
This commit is contained in:
吴昊天 2026-10-08 16:17:58 +08:00
parent 060fdaa263
commit 91ef48d450
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitignore vendored
View File

@ -32,11 +32,3 @@
#docker
/docker/mysql/data/*
/docker/mysql/log/*
<<<<<<< HEAD
.DS_Store
=======
>>>>>>> 445c2b9e8 (fix(workerman): 统一 workerman/timer 运行时文件到 runtime 目录)
#docker
/docker/mysql/data/*
/docker/mysql/log/*