From d7759b9489abb9a2228a2208b139f9a11284093d Mon Sep 17 00:00:00 2001
From: Matthew Kalahiki <kalahikimw@hendrix.edu>
Date: Tue, 13 Apr 2021 21:22:30 -0500
Subject: [PATCH] Hopefully fixed what the merge messed up

---
 MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.meta      | 8 ++++++++
 ...a => MatthewTestScene.unity.meta~Stashed changes.meta} | 4 ++--
 .../MatthewTestScene.unity.meta~Updated upstream.meta     | 7 +++++++
 MuseumGame/ProjectSettings/TagManager.asset               | 1 +
 4 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.meta
 rename MuseumGame/Assets/Scenes/{DemoLevels/Spike Scene/Player.prefab.meta => MatthewTestScene.unity.meta~Stashed changes.meta} (63%)
 create mode 100644 MuseumGame/Assets/Scenes/MatthewTestScene.unity.meta~Updated upstream.meta

diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.meta b/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.meta
new file mode 100644
index 0000000..ed4b44a
--- /dev/null
+++ b/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 297cf2de6c239934ba985a97912b24c4
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene/Player.prefab.meta b/MuseumGame/Assets/Scenes/MatthewTestScene.unity.meta~Stashed changes.meta
similarity index 63%
rename from MuseumGame/Assets/Scenes/DemoLevels/Spike Scene/Player.prefab.meta
rename to MuseumGame/Assets/Scenes/MatthewTestScene.unity.meta~Stashed changes.meta
index a3fee42..a0ee71a 100644
--- a/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene/Player.prefab.meta	
+++ b/MuseumGame/Assets/Scenes/MatthewTestScene.unity.meta~Stashed changes.meta	
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: d09540dbafa36436c910a9a2fbf9c191
-PrefabImporter:
+guid: 602763653dee1c94f86c93c46a01efac
+DefaultImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 
diff --git a/MuseumGame/Assets/Scenes/MatthewTestScene.unity.meta~Updated upstream.meta b/MuseumGame/Assets/Scenes/MatthewTestScene.unity.meta~Updated upstream.meta
new file mode 100644
index 0000000..4b0ce6b
--- /dev/null
+++ b/MuseumGame/Assets/Scenes/MatthewTestScene.unity.meta~Updated upstream.meta	
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ce6abb1e102545240939a18c71a13801
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/MuseumGame/ProjectSettings/TagManager.asset b/MuseumGame/ProjectSettings/TagManager.asset
index cb06402..8efc84f 100644
--- a/MuseumGame/ProjectSettings/TagManager.asset
+++ b/MuseumGame/ProjectSettings/TagManager.asset
@@ -5,6 +5,7 @@ TagManager:
   serializedVersion: 2
   tags:
   - EnemyProjectile
+  - Platform
   layers:
   - Default
   - TransparentFX