final changes

2022-03-28 17:00:22 +03:00
parent 53bd10a13c
commit af07a29f40
12 changed files with 33 additions and 9 deletions
--- a/Files/Prefabs/Arlo.meta
+++ b/Files/Prefabs/Arlo.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cf9fd337edc6b034da268d1306e045a9
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Files/Prefabs/Arlo/Cube.prefab.meta
+++ b/Files/Prefabs/Arlo/Cube.prefab.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<<< HEAD:Assets/Project Files/Prefabs/Arlo/Cube.prefab.meta
-guid: d427f0f5ff0359f4c92a56ed37a11542
+guid: c89fd30ca0b56fb41a415d285d87b219
 ========
 guid: 8f5582064724dbc45bc5c3432899f9c1
 >>>>>>>> origin/joonasp_Milestone2:Assets/Project Files/Prefabs/JoonasP/Lever.prefab.meta
--- a/Files/Prefabs/JoonasP/EssenceNode.prefab.meta
+++ b/Files/Prefabs/JoonasP/EssenceNode.prefab.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<<< HEAD:Assets/Project Files/Scripts/Helar/Items.meta
-guid: c509c0c7d8d7f2942a05792798d31fc0
+guid: 215fe2a51d12ecc43ba8f86d3dc3ae54
 folderAsset: yes
 DefaultImporter:
 ========
--- a/Files/Prefabs/JoonasP/FlyingWand.prefab.meta
+++ b/Files/Prefabs/JoonasP/FlyingWand.prefab.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<<< HEAD:Assets/Resources/Helar.meta
-guid: af818d2fbe0b12e4794f02d093a8d1c5
+guid: 551c14077760549478d9927a77d319ee
 folderAsset: yes
 DefaultImporter:
 ========
--- a/Files/Prefabs/JoonasP/Lever.prefab.meta
+++ b/Files/Prefabs/JoonasP/Lever.prefab.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<<< HEAD:Assets/Project Files/Prefabs/Arlo/Cube.prefab.meta
-guid: d427f0f5ff0359f4c92a56ed37a11542
+guid: cb8b19b563b3d224897e3b3d94c353aa
 ========
 guid: 8f5582064724dbc45bc5c3432899f9c1
 >>>>>>>> origin/joonasp_Milestone2:Assets/Project Files/Prefabs/JoonasP/Lever.prefab.meta