From 27be7a2c517404e4622470edf7b83b13129220ff Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期五, 08 十二月 2023 11:14:04 +0800
Subject: [PATCH] merge conflicts

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

diff --git a/.gitignore b/.gitignore
index 8365624..b597af9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,11 @@
 
 *.exe
 *.test
+.vscode
+.idea
+*.db
+vendor
+logs
+wms*
+WMS*
+*.bleve

--
Gitblit v1.8.0