merge door to staging

2022-03-28 16:54:50 +03:00
parent 99d412b258 fb14e165d4
commit 53bd10a13c
1331 changed files with 410263 additions and 5190 deletions
--- a/Assets/QuickOutline/Resources.meta
+++ b/Assets/QuickOutline/Resources.meta
@@ -1,8 +1,12 @@
 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: 
--- a/Assets/QuickOutline/Samples/Scenes/QuickOutline.unity.meta
+++ b/Assets/QuickOutline/Samples/Scenes/QuickOutline.unity.meta
@@ -1,7 +1,11 @@
 fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/QuickOutline/Samples/Scenes/QuickOutline.unity.meta
 guid: f23712c79adc910408e872b127e825cf
 timeCreated: 1522615825
 licenseType: Store
+========
+guid: 3e003a7052336a84388878dca47c8528
+>>>>>>>> origin/DoorInteration:Assets/LowPolyDungeons/Scenes/LowPolyDungeons_Demo.unity.meta
 DefaultImporter:
  externalObjects: {}
  userData: