fix conflict

jimi-wzq

2020-08-01 695953440565103964e816e7326c66f3d171c3e0

 .gitignore

@@ -12,7 +12,6 @@
*.pch

# Compiled Dynamic libraries
*.so
*.dylib
*.dll

@@ -23,7 +22,13 @@
# Compiled Static libraries
*.lai
*.la
*.a
# Compiled Dynamic libraries
*.dylib
*.dll

# Compiled Static libraries
*.lai
*.la
*.lib

# Executables
@@ -33,3 +38,9 @@
*.tar
*.tar.gz
.vscode/
.idea/

build/
*.tmp
*.txt
core