soundvision/UnityProject/Assets/Scenes/Examples/Azure/AzureDemo.unity.meta

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:
Added Pd CYLsim 2019-12-10 13:38:41 +00:00			`fileFormatVersion: 2`
Merge branch 'refs/heads/master' into Azure_Integration_RenderBuffer # 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 2019-12-12 12:18:26 +00:00			`<<<<<<< HEAD:UnityProject/Assets/Scenes/Examples/Azure/AzureDemo.unity.meta`
update AzureDemo scene 2019-12-12 12:16:29 +00:00			`guid: d2b605d5e6f33cb43a6b49852af3bc24`
Merge branch 'refs/heads/master' into Azure_Integration_RenderBuffer # 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 2019-12-12 12:18:26 +00:00			`=======`
			`guid: df11262fc1b053a488b5cfbf724e4cda`
			`folderAsset: yes`
			`>>>>>>> refs/heads/master:UnityProject/Assets/Scenes/Examples/Azure.meta`
Added Pd CYLsim 2019-12-10 13:38:41 +00:00			`DefaultImporter:`
			`externalObjects: {}`
			`userData:`
			`assetBundleName:`
			`assetBundleVariant:`