From b7228c8620a6a0b593f1d8b82af5aac7ba456a85 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 28 七月 2020 17:12:17 +0800
Subject: [PATCH] fix conflict

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

diff --git a/.gitignore b/.gitignore
index 31c642f..608689c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,9 @@
 *.tar
 *.tar.gz
 .vscode/
+.idea
+
+build/
+*.tmp
+*.txt
+core

--
Gitblit v1.8.0