fix conflict

wangzhengquan

2020-10-30 5d0308e79a5dff5b040504a17c6300bafdeb1499

 .gitignore

@@ -22,6 +22,14 @@
# Compiled Static libraries
*.lai
*.la
# Compiled Dynamic libraries
*.dylib
*.dll

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

# Executables
*.exe
@@ -29,4 +37,11 @@
*.app
*.tar
*.tar.gz
*.d
.vscode/
.idea/

build/
*.tmp
*.txt
core