4d3aea9f99
# Conflicts: # meng_yao/Assets/Scenes/scene_Main.unity # meng_yao/Assets/script/scene_Main/ManurePanel.cs.meta
16 lines
352 B
Plaintext
16 lines
352 B
Plaintext
fileFormatVersion: 2
|
|
<<<<<<< HEAD
|
|
guid: de0d4ed2d4a4a3d47b735cb2fd1ce575
|
|
=======
|
|
guid: f03d12340aff50a429546bc27002ff44
|
|
>>>>>>> e2fbb81bb59a0ed69d725bd46f177ea0d8fee509
|
|
MonoImporter:
|
|
externalObjects: {}
|
|
serializedVersion: 2
|
|
defaultReferences: []
|
|
executionOrder: 0
|
|
icon: {instanceID: 0}
|
|
userData:
|
|
assetBundleName:
|
|
assetBundleVariant:
|