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

diff --git a/.gitignore b/.gitignore
index d37cf8e..00f1df1 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
@@ -33,3 +38,8 @@
 *.tar
 *.tar.gz
 .vscode/
+.idea
+
+build/
+*.tmp
+*.txt

--
Gitblit v1.8.0