From 21afe7a2024b0158904ebe08a9d3f5f914792484 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期五, 12 六月 2020 14:58:08 +0800
Subject: [PATCH] commit

---
 .gitignore |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index 86b69a9..21877ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,25 +1,34 @@
+<<<<<<< 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
@@ -30,7 +39,10 @@
 *.exe
 *.out
 *.app
+<<<<<<< HEAD
 *.tar
 *.tar.gz
 .vscode/
 build/
+=======
+>>>>>>> 419dba7aed489a0f83267fde64396b396994fff8

--
Gitblit v1.8.0