From 493caef7413992d0215b9c2e2bcedd30471d89e7 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 26 三月 2024 15:49:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

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

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

--
Gitblit v1.9.3