From 9342bbef5659a43114193a725a96ad852eec7a79 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 17 九月 2021 23:39:27 +0800
Subject: [PATCH] fix 修复合并错误

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

diff --git a/.gitignore b/.gitignore
index fd446f4..2c0e049 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,7 +37,8 @@
 # Others
 *.log
 *.xml.versionsBackup
+*.swp
 
 !*/build/*.java
 !*/build/*.html
-!*/build/*.xml
\ No newline at end of file
+!*/build/*.xml

--
Gitblit v1.9.3