saipo/Warcorrespondents
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/gensokyogroup/RedGame/Warcorrespondents

Browse Source 
# Conflicts:
#	.gitignore
This commit is contained in:
SAIPO 2021-07-01 03:10:33 +08:00
commit f4a4920d25
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -23,7 +23,10 @@ ExportedObj/
*.svd *.svd
*.pdb *.pdb
*.opendb *.opendb
<<<<<<< HEAD
*.log *.log
=======
>>>>>>> 2a9bf24055da7ac69750606b87aaf578f19f5c8f
# Unity3D generated meta files # Unity3D generated meta files
*.pidb.meta *.pidb.meta