解决冲突

wangzhengquan

2020-07-20 634f5da8c988a5e83edfb5053260ea110bce337d

 .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