From 950f31ee2351e2d26ede3eeba49c09d52f46b296 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 03 十一月 2023 17:31:53 +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