M-Gameton-06/Gameton-06/ProjectSettings/TagManager.asset at 45e10cf07d6ababcd197c18f20f8949f368b419f - M-Gameton-06 - Gitea: Git with a cup of tea

mcutegs2/M-Gameton-06

Files

aube.lee eb371d10ea Merge branch 'art' into dev

# Conflicts:
#	Gameton-06/Assets/Gameton/Art/Map/Legacy_Adventure_Pack_Grassland/Tiles/Assets/Assets.png.meta
#	Gameton-06/Assets/Gameton/Scenes/Personal Scenes/map_scene/MapReferenceScene.unity
#	Gameton-06/ProjectSettings/TagManager.asset

2025-02-13 11:28:53 +09:00

9 lines

246 BLFS

Plaintext

Raw Blame History

 version https://git-lfs.github.com/spec/v1
 <<<<<<< HEAD
 oid sha256:9b3bff9403e572fe73946c753ffc41aa1e9ae58068aeb8d2d4e7a60e723e0c84
 size 412
 =======
 oid sha256:c4a9c686c702b074b1a618e916077d097c9bc4b74bc4f3902304eb35841b56e4
 size 458
 >>>>>>> art