aswew1538
7f6e04485c
# Conflicts: # Assets/01_Scenes/Cave_Test_2/NavMesh-Cube (2).asset.meta # 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/My project/Fishing Scripts/model/New Material.mat.meta # Assets/XR/Settings/OpenXR Package Settings.asset.meta # Assets/XR/Settings/OpenXRPackageSettings.asset
16 lines
489 B
Plaintext
16 lines
489 B
Plaintext
fileFormatVersion: 2
|
|
<<<<<<<< HEAD:Assets/My project/Fishing Scripts/model/New Material.mat.meta
|
|
guid: 803c199824d061648a60dcefbaab9c14
|
|
NativeFormatImporter:
|
|
externalObjects: {}
|
|
mainObjectFileID: 2100000
|
|
========
|
|
guid: 9c0e704ea9510154c87905364d1e2058
|
|
NativeFormatImporter:
|
|
externalObjects: {}
|
|
mainObjectFileID: 11400000
|
|
>>>>>>>> b688a14be4642113a27a5e81d7c3f9922d9c34f4:Assets/XR/Settings/OpenXR Package Settings.asset.meta
|
|
userData:
|
|
assetBundleName:
|
|
assetBundleVariant:
|