From d803609b8a2e43afcf5921f42f29ce7f6e68fb84 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期三, 08 十一月 2023 17:02:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 .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