From f68c30d25c7849cb2487c2a64967d4cfd5f66c68 Mon Sep 17 00:00:00 2001
From: Akhmad Setiawan <13521164@mahasiswa.itb.ac.id>
Date: Fri, 10 May 2024 23:04:54 +0700
Subject: [PATCH] fix: solve merge conflict
---
Assets/Free Pack/Ghost Manifestation 2.wav.meta | 2 +-
.../Procedural fire/Demo scene/Concrete slab.png.meta | 2 +-
.../Procedural fire/Demo scene/Concrete slab_Height.png.meta | 2 +-
.../Demo scene/Concrete slab_MetallicSmoothness.png.meta | 2 +-
.../Procedural fire/Demo scene/Concrete slab_Normal.png.meta | 2 +-
Assets/Hovl Studio/Procedural fire/Demo scene/Floor3.mat.meta | 2 +-
.../Procedural fire/Demo scene/LightingData.asset.meta | 2 +-
.../Procedural fire/Demo scene/Lightmap-0_comp_dir.png.meta | 2 +-
.../Procedural fire/Demo scene/Lightmap-0_comp_light.exr.meta | 2 +-
Assets/Hovl Studio/Procedural fire/Demo scene/Readme.txt.meta | 2 +-
.../Procedural fire/Demo scene/ReflectionProbe-0.exr.meta | 2 +-
.../Procedural fire/Demo scene/ReflectionProbe-1.exr.meta | 2 +-
Assets/Hovl Studio/Procedural fire/Textures/Smoke26.png.meta | 2 +-
Assets/Hovl Studio/Procedural fire/Textures/Trail67.png.meta | 2 +-
14 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Assets/Free Pack/Ghost Manifestation 2.wav.meta b/Assets/Free Pack/Ghost Manifestation 2.wav.meta
index 12a33cc..7a30b4f 100644
--- a/Assets/Free Pack/Ghost Manifestation 2.wav.meta
+++ b/Assets/Free Pack/Ghost Manifestation 2.wav.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 618be86712ffac947997f96463301683
+guid: 9ca709354652bf84baba5569eeb0141c
timeCreated: 1570802987
licenseType: Store
AudioImporter:
diff --git a/Assets/Hovl Studio/Procedural fire/Demo scene/Concrete slab.png.meta b/Assets/Hovl Studio/Procedural fire/Demo scene/Concrete slab.png.meta
index 6869055..745549b 100644
--- a/Assets/Hovl Studio/Procedural fire/Demo scene/Concrete slab.png.meta
+++ b/Assets/Hovl Studio/Procedural fire/Demo scene/Concrete slab.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 1b13dc101cf2ac7418019fd776161658
+guid: 0971a6f4aa22fc1429568ac3746e6a93
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
diff --git a/Assets/Hovl Studio/Procedural fire/Demo scene/Concrete slab_Height.png.meta b/Assets/Hovl Studio/Procedural fire/Demo scene/Concrete slab_Height.png.meta
index 12846c5..27b0441 100644
--- a/Assets/Hovl Studio/Procedural fire/Demo scene/Concrete slab_Height.png.meta
+++ b/Assets/Hovl Studio/Procedural fire/Demo scene/Concrete slab_Height.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: db368c1c85b12fe48aba6cc9bcd41f43
+guid: 9b7fcde7ad954574b8008850ebde7d58
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
diff --git a/Assets/Hovl Studio/Procedural fire/Demo scene/Concrete slab_MetallicSmoothness.png.meta b/Assets/Hovl Studio/Procedural fire/Demo scene/Concrete slab_MetallicSmoothness.png.meta
index c1e4bb4..fc63dcb 100644
--- a/Assets/Hovl Studio/Procedural fire/Demo scene/Concrete slab_MetallicSmoothness.png.meta
+++ b/Assets/Hovl Studio/Procedural fire/Demo scene/Concrete slab_MetallicSmoothness.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: a685c8f461a651a46a2631ea3decafae
+guid: 34155a0d1c2385b4a8a668ee2d4bd93f
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
diff --git a/Assets/Hovl Studio/Procedural fire/Demo scene/Concrete slab_Normal.png.meta b/Assets/Hovl Studio/Procedural fire/Demo scene/Concrete slab_Normal.png.meta
index 3028a54..7c1a771 100644
--- a/Assets/Hovl Studio/Procedural fire/Demo scene/Concrete slab_Normal.png.meta
+++ b/Assets/Hovl Studio/Procedural fire/Demo scene/Concrete slab_Normal.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 3a0dde7201a17f646865e8deeac56596
+guid: 76756a8b58dd0b84f8d9e1d6e2698f1c
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
diff --git a/Assets/Hovl Studio/Procedural fire/Demo scene/Floor3.mat.meta b/Assets/Hovl Studio/Procedural fire/Demo scene/Floor3.mat.meta
index 2425c2c..5de7789 100644
--- a/Assets/Hovl Studio/Procedural fire/Demo scene/Floor3.mat.meta
+++ b/Assets/Hovl Studio/Procedural fire/Demo scene/Floor3.mat.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: ca6fd35d7de69cb449d560ab9228d502
+guid: 4322ab7ee09ebfd4c974c17f67ffa606
timeCreated: 1536001511
licenseType: Store
NativeFormatImporter:
diff --git a/Assets/Hovl Studio/Procedural fire/Demo scene/LightingData.asset.meta b/Assets/Hovl Studio/Procedural fire/Demo scene/LightingData.asset.meta
index 6651ca8..fc7b609 100644
--- a/Assets/Hovl Studio/Procedural fire/Demo scene/LightingData.asset.meta
+++ b/Assets/Hovl Studio/Procedural fire/Demo scene/LightingData.asset.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: faa4b86ef3c40464a90105bd7feb5ad9
+guid: f13d1eb12534b6341a2a1203e12b004c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 25800000
diff --git a/Assets/Hovl Studio/Procedural fire/Demo scene/Lightmap-0_comp_dir.png.meta b/Assets/Hovl Studio/Procedural fire/Demo scene/Lightmap-0_comp_dir.png.meta
index 6a01697..23a289d 100644
--- a/Assets/Hovl Studio/Procedural fire/Demo scene/Lightmap-0_comp_dir.png.meta
+++ b/Assets/Hovl Studio/Procedural fire/Demo scene/Lightmap-0_comp_dir.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 4a3abcea8684f464a9b302dd7a047387
+guid: 6b7ed4f52a153ed4da9230729d3d7163
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
diff --git a/Assets/Hovl Studio/Procedural fire/Demo scene/Lightmap-0_comp_light.exr.meta b/Assets/Hovl Studio/Procedural fire/Demo scene/Lightmap-0_comp_light.exr.meta
index 84c3379..97d0e8c 100644
--- a/Assets/Hovl Studio/Procedural fire/Demo scene/Lightmap-0_comp_light.exr.meta
+++ b/Assets/Hovl Studio/Procedural fire/Demo scene/Lightmap-0_comp_light.exr.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 9960b70afbb00c1468c54c31462b736a
+guid: 9ae51d0edb8a5264595591ec80463045
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
diff --git a/Assets/Hovl Studio/Procedural fire/Demo scene/Readme.txt.meta b/Assets/Hovl Studio/Procedural fire/Demo scene/Readme.txt.meta
index 3450281..81e8370 100644
--- a/Assets/Hovl Studio/Procedural fire/Demo scene/Readme.txt.meta
+++ b/Assets/Hovl Studio/Procedural fire/Demo scene/Readme.txt.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 2f20ef09debf8784c9226434f4bc541d
+guid: 01ca5383d977f0f45a33f791f12fec68
TextScriptImporter:
externalObjects: {}
userData:
diff --git a/Assets/Hovl Studio/Procedural fire/Demo scene/ReflectionProbe-0.exr.meta b/Assets/Hovl Studio/Procedural fire/Demo scene/ReflectionProbe-0.exr.meta
index 4f7957e..d5e9680 100644
--- a/Assets/Hovl Studio/Procedural fire/Demo scene/ReflectionProbe-0.exr.meta
+++ b/Assets/Hovl Studio/Procedural fire/Demo scene/ReflectionProbe-0.exr.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: b437cf6f67f5f1c4e9f1876cbbb8aceb
+guid: d6db342acccc6814c94d4efb597ac519
TextureImporter:
fileIDToRecycleName:
8900000: generatedCubemap
diff --git a/Assets/Hovl Studio/Procedural fire/Demo scene/ReflectionProbe-1.exr.meta b/Assets/Hovl Studio/Procedural fire/Demo scene/ReflectionProbe-1.exr.meta
index 76559f3..1e4795d 100644
--- a/Assets/Hovl Studio/Procedural fire/Demo scene/ReflectionProbe-1.exr.meta
+++ b/Assets/Hovl Studio/Procedural fire/Demo scene/ReflectionProbe-1.exr.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 6cd5e7294f0f7be4aa89e131da9505b4
+guid: f0b61d8a4bf12264b91c61dad69e0088
TextureImporter:
fileIDToRecycleName:
8900000: generatedCubemap
diff --git a/Assets/Hovl Studio/Procedural fire/Textures/Smoke26.png.meta b/Assets/Hovl Studio/Procedural fire/Textures/Smoke26.png.meta
index d984971..545ace4 100644
--- a/Assets/Hovl Studio/Procedural fire/Textures/Smoke26.png.meta
+++ b/Assets/Hovl Studio/Procedural fire/Textures/Smoke26.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 08b3912bdc0a5ed4d9a27125425a97f4
+guid: e45fa24557de091449d7afea8a87e736
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
diff --git a/Assets/Hovl Studio/Procedural fire/Textures/Trail67.png.meta b/Assets/Hovl Studio/Procedural fire/Textures/Trail67.png.meta
index 7412410..04c5b55 100644
--- a/Assets/Hovl Studio/Procedural fire/Textures/Trail67.png.meta
+++ b/Assets/Hovl Studio/Procedural fire/Textures/Trail67.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: c4f655f5d01f55547a23a546b58afd04
+guid: ebbb7cd466c2ac44ba16c2722fd1c7c5
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
--
GitLab