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

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

diff --git a/.gitignore b/.gitignore
index deff700..00f1df1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,7 @@
 *.tar
 *.tar.gz
 .vscode/
+.idea
 
 build/
 *.tmp

--
Gitblit v1.8.0