merge door to staging
This commit is contained in:
@@ -0,0 +1,14 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<<< HEAD:Assets/QuickOutline/Resources.meta
|
||||
guid: 70fd40674751a8042a8b9b2e8d9f915f
|
||||
folderAsset: yes
|
||||
timeCreated: 1522559128
|
||||
licenseType: Store
|
||||
========
|
||||
guid: f0ea08c3c4ee3b2429e2068231686db1
|
||||
>>>>>>>> origin/DoorInteration:Assets/LowPolyDungeons/Scenes/LowPolyDungeons_Overview.unity.meta
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user