Merge branch 'master' of https://e.coding.net/gensokyogroup/RedGame/Warcorrespondents
# Conflicts: # .gitignore
This commit is contained in:
commit
f4a4920d25
3
.gitignore
vendored
3
.gitignore
vendored
@ -23,7 +23,10 @@ ExportedObj/
|
||||
*.svd
|
||||
*.pdb
|
||||
*.opendb
|
||||
<<<<<<< HEAD
|
||||
*.log
|
||||
=======
|
||||
>>>>>>> 2a9bf24055da7ac69750606b87aaf578f19f5c8f
|
||||
|
||||
# Unity3D generated meta files
|
||||
*.pidb.meta
|
||||
|
Loading…
x
Reference in New Issue
Block a user