Resolved merge conflicts on README and gitignore

This commit is contained in:
2021-01-29 21:36:19 -05:00
2 changed files with 0 additions and 10 deletions

1
.gitignore vendored
View File

@ -48,7 +48,6 @@
# Linker output
*.ilk
#*.map
*.exp
# Precompiled Headers