From 695953440565103964e816e7326c66f3d171c3e0 Mon Sep 17 00:00:00 2001
From: jimi-wzq <wangzhengquan85@gmail.com>
Date: 星期六, 01 八月 2020 10:48:18 +0800
Subject: [PATCH] fix conflict

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

diff --git a/.gitignore b/.gitignore
index 00f1df1..9900498 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,8 +38,9 @@
 *.tar
 *.tar.gz
 .vscode/
-.idea
+.idea/
 
 build/
 *.tmp
 *.txt
+core

--
Gitblit v1.8.0