From 5d0308e79a5dff5b040504a17c6300bafdeb1499 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期五, 30 十月 2020 09:36:41 +0800
Subject: [PATCH] fix conflict

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

diff --git a/.gitignore b/.gitignore
index 00f1df1..533c2f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,9 +37,11 @@
 *.app
 *.tar
 *.tar.gz
+*.d
 .vscode/
-.idea
+.idea/
 
 build/
 *.tmp
 *.txt
+core

--
Gitblit v1.8.0