From 91ef48d450a286e71541de552250e07ff4a25094 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Thu, 8 Oct 2026 16:17:58 +0800
Subject: [PATCH] =?UTF-8?q?fix(.gitignore):=20=E7=A7=BB=E9=99=A4=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81=E6=A0=87=E8=AE=B0=E5=92=8C=E5=A4=9A=E4=BD=99=E7=9A=84?=
 =?UTF-8?q?=20.DS=5FStore=20=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 95d26b6bb..720e6ff3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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/*