From 9adff020617386fba03a4098c67389631d4fe58e Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期六, 13 六月 2020 10:02:27 +0800
Subject: [PATCH] update

---
 .gitignore |   16 ++--------------
 1 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 21877ca..2cd7b4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,48 +1,36 @@
-<<<<<<< HEAD
 # Prerequisites
 *.d
 
-=======
->>>>>>> 419dba7aed489a0f83267fde64396b396994fff8
 # Compiled Object files
 *.slo
 *.lo
 *.o
 *.obj
 
-<<<<<<< HEAD
 # Precompiled Headers
 *.gch
 *.pch
 
-=======
->>>>>>> 419dba7aed489a0f83267fde64396b396994fff8
 # Compiled Dynamic libraries
-*.so
 *.dylib
 *.dll
 
-<<<<<<< HEAD
 # Fortran module files
 *.mod
 *.smod
 
-=======
->>>>>>> 419dba7aed489a0f83267fde64396b396994fff8
 # Compiled Static libraries
 *.lai
 *.la
-*.a
 *.lib
 
 # Executables
 *.exe
 *.out
 *.app
-<<<<<<< HEAD
 *.tar
 *.tar.gz
 .vscode/
 build/
-=======
->>>>>>> 419dba7aed489a0f83267fde64396b396994fff8
+*.a
+*.so

--
Gitblit v1.8.0