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

diff --git a/.gitignore b/.gitignore
index 0def275..60e4956 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,21 +1,48 @@
+# Prerequisites
+*.d
+
 # Compiled Object files
 *.slo
 *.lo
 *.o
 *.obj
 
+# Precompiled Headers
+*.gch
+*.pch
+
 # Compiled Dynamic libraries
-*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+*.smod
+
+# Compiled Static libraries
+*.lai
+*.la
+# Compiled Dynamic libraries
 *.dylib
 *.dll
 
 # Compiled Static libraries
 *.lai
 *.la
-*.a
 *.lib
 
 # Executables
 *.exe
 *.out
 *.app
+*.tar
+*.tar.gz
+*.d
+.vscode/
+.idea/
+
+build/
+dest/
+cmake-build-debug/
+*.tmp
+core

--
Gitblit v1.8.0