From 1ccdcb4a890687d59b272f5397e8b41ae4ce2254 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 07 十一月 2023 16:23:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

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

--
Gitblit v1.9.3