From b272fec78e30d1a10f3ab761684a119193391296 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 19 十一月 2024 17:08:57 +0800
Subject: [PATCH] 解决冲突

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

diff --git a/.gitignore b/.gitignore
index cba8701..2344cdf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@
 .vscode
 .ipynb_checkpoints
 .pytest
+*.log
+*.log.*

--
Gitblit v1.8.0