From cda315b3a19919cae922bdbe96bc20eab4e29fcc Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 30 六月 2022 18:03:24 +0800
Subject: [PATCH] 版本合并冲突修改

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

diff --git a/.gitignore b/.gitignore
index 1c38a68..35d3fc0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,9 @@
 bld/
 [Bb]in/
 [Oo]bj/
+.vs/
+.DS_Store
+.gitignore
 
 # Roslyn cache directories
 *.ide/

--
Gitblit v1.8.0