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

diff --git a/.gitignore b/.gitignore
index 0def275..00f1df1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,21 +1,45 @@
+# 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
+.vscode/
+.idea
+
+build/
+*.tmp
+*.txt

--
Gitblit v1.8.0