Resolved merge conflicts on README and gitignore
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@ -48,7 +48,6 @@
|
||||
|
||||
# Linker output
|
||||
*.ilk
|
||||
#*.map
|
||||
*.exp
|
||||
|
||||
# Precompiled Headers
|
||||
|
Reference in New Issue
Block a user