From 14be935a4f8231233487d510c8db0b544bcf0f69 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 25 一月 2021 17:40:29 +0800
Subject: [PATCH] fix conflict

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

diff --git a/.gitignore b/.gitignore
index deff700..60e4956 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,8 +37,12 @@
 *.app
 *.tar
 *.tar.gz
+*.d
 .vscode/
+.idea/
 
 build/
+dest/
+cmake-build-debug/
 *.tmp
-*.txt
+core

--
Gitblit v1.8.0