e2c873d099
# Conflicts: # UnityProject/Assembly-CSharp-Editor.csproj # UnityProject/Assembly-CSharp.csproj # UnityProject/Assets/Scenes/Examples/Azure.meta # UnityProject/Assets/Scenes/Examples/Azure/AzureDemo.unity # UnityProject/Assets/Scenes/Examples/Azure/AzureDemo.unity.meta # UnityProject/Assets/Scripts/UnitTest.meta # UnityProject/Assets/ThridParty/Assets/Construction_Site_Column/Materials.meta
12 lines
368 B
Text
12 lines
368 B
Text
fileFormatVersion: 2
|
|
<<<<<<< HEAD:UnityProject/Assets/Scenes/Examples/Azure/AzureDemo.unity.meta
|
|
guid: d2b605d5e6f33cb43a6b49852af3bc24
|
|
=======
|
|
guid: df11262fc1b053a488b5cfbf724e4cda
|
|
folderAsset: yes
|
|
>>>>>>> refs/heads/master:UnityProject/Assets/Scenes/Examples/Azure.meta
|
|
DefaultImporter:
|
|
externalObjects: {}
|
|
userData:
|
|
assetBundleName:
|
|
assetBundleVariant:
|