conflict

wangzhengquan

2020-07-28 baa6fb17d950c4f5684f5d798f90595456723418

 .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