From 07fa589e06415ca41fc29d22c7c8f3f1b4917147 Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期一, 23 五月 2022 09:42:32 +0800
Subject: [PATCH] 处理冲突

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

diff --git a/.gitignore b/.gitignore
index 54054a0..21f4006 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@
 
 # Log file
 *.log
-
+logs/*
 # BlueJ files
 *.ctxt
 
@@ -26,3 +26,4 @@
 /.idea/
 /target/
 
+/src/main/resources/static/

--
Gitblit v1.8.0