# Conflicts:
#	.gitignore
This commit is contained in:
SAIPO 2021-07-01 03:10:33 +08:00
commit f4a4920d25

3
.gitignore vendored
View File

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