lishuo
70626ae741
# Conflicts: # Assets/NuGet.meta # Assets/Resources/Images/Ride.meta # Assets/Resources/Sound.meta # Assets/Scripts/App.cs # Assets/Scripts/UI/Prefab/BigMap/Tips.cs # Assets/StreamingAssets.meta
13 lines
303 B
Plaintext
13 lines
303 B
Plaintext
fileFormatVersion: 2
|
|
<<<<<<< HEAD:Assets/Resources/Images/Ride.meta
|
|
guid: c424b00c77060e24db3aa7985281b01e
|
|
=======
|
|
guid: 217cb7caed5f7fb49b339428b1d80974
|
|
>>>>>>> origin/dev:Assets/NuGet.meta
|
|
folderAsset: yes
|
|
DefaultImporter:
|
|
externalObjects: {}
|
|
userData:
|
|
assetBundleName:
|
|
assetBundleVariant:
|