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 |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index d37cf8e..60e4956 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,6 @@
 *.pch
 
 # Compiled Dynamic libraries
-*.so
 *.dylib
 *.dll
 
@@ -23,7 +22,13 @@
 # Compiled Static libraries
 *.lai
 *.la
-*.a
+# Compiled Dynamic libraries
+*.dylib
+*.dll
+
+# Compiled Static libraries
+*.lai
+*.la
 *.lib
 
 # Executables
@@ -32,4 +37,12 @@
 *.app
 *.tar
 *.tar.gz
+*.d
 .vscode/
+.idea/
+
+build/
+dest/
+cmake-build-debug/
+*.tmp
+core

--
Gitblit v1.8.0