Fingers crossed Merge attempt

7b00fa6f · Michael LaFreniere · 7aa09961 · 7b00fa6f · 7b00fa6f · 7b00fa6f
Commit 7b00fa6f authored 8 years ago by Michael LaFreniere
--- a/Zookeepers Trial/Library/CurrentLayout.dwlt
+++ b/Zookeepers Trial/Library/CurrentLayout.dwlt
--- a/Zookeepers Trial/Library/LastSceneManagerSetup.txt
+++ b/Zookeepers Trial/Library/LastSceneManagerSetup.txt
 sceneSetups:
- path: Assets/Scenes/mainmenu.unity
+- path: Assets/Scenes/arena.unity
  isLoaded: 1
  isActive: 1
--- a/Zookeepers Trial/Library/assetDatabase3
+++ b/Zookeepers Trial/Library/assetDatabase3
--- a/Zookeepers Trial/Library/expandedItems
+++ b/Zookeepers Trial/Library/expandedItems
--- a/Zookeepers Trial/Library/metadata/00/00000000000000004000000000000000
+++ b/Zookeepers Trial/Library/metadata/00/00000000000000004000000000000000
--- a/Zookeepers Trial/Library/metadata/00/00000000000000006100000000000000
+++ b/Zookeepers Trial/Library/metadata/00/00000000000000006100000000000000