From dae6e068207ad1bff32dafd8c71f12d8a2a59aa2 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 15 四月 2024 16:21:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 .gitignore |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5152181..9dd0fcc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
-/ardLog/logs/
-/ardLog/
+/log/
+/ruoyi-ui
+/server/mediamtx/mediamtx.yml

--
Gitblit v1.9.3