aswew1538
8e8f8daf29
# Conflicts:yyhh # Assets/09_UI/talk/menu_panel_REAL_transparent_cropped.png.meta # Assets/09_UI/talk/pinocchio_title_banner_REAL_transparent_cropped.png.meta # Assets/09_UI/talk/wood_button_plain_REAL_transparent.png.meta # Assets/XR/Settings/OpenXR Package Settings.asset.meta
13 lines
291 B
Plaintext
13 lines
291 B
Plaintext
fileFormatVersion: 2
|
|
<<<<<<< HEAD
|
|
guid: 0ebc173c38e576e46af1152cd6521c4c
|
|
=======
|
|
guid: 0d7aaa1930bdf854dbc499330b88fc84
|
|
>>>>>>> dace9380396749ea751e95697f4b74adaecb007d
|
|
NativeFormatImporter:
|
|
externalObjects: {}
|
|
mainObjectFileID: 0
|
|
userData:
|
|
assetBundleName:
|
|
assetBundleVariant:
|