Merge remote-tracking branch 'origin/master'

a09e3e3f · Michael LaFreniere · aded642e · 83af3627 · a09e3e3f · a09e3e3f
Commit a09e3e3f authored 8 years ago by Michael LaFreniere
--- a/Zookeepers Trial/Library/LastSceneManagerSetup.txt
+++ b/Zookeepers Trial/Library/LastSceneManagerSetup.txt
 sceneSetups:
+<<<<<<< HEAD
 - path: Assets/Scenes/Start.unity
+=======
+- path: Assets/Scenes/Town01.unity
+>>>>>>> origin/master
  isLoaded: 1
  isActive: 1
--- a/Zookeepers Trial/Library/metadata/00/00000000000000002000000000000000
+++ b/Zookeepers Trial/Library/metadata/00/00000000000000002000000000000000
--- a/Zookeepers Trial/Library/metadata/00/00000000000000003000000000000000
+++ b/Zookeepers Trial/Library/metadata/00/00000000000000003000000000000000
--- a/Zookeepers Trial/Library/metadata/00/00000000000000004100000000000000
+++ b/Zookeepers Trial/Library/metadata/00/00000000000000004100000000000000
--- a/Zookeepers Trial/Library/metadata/00/00000000000000005000000000000000
+++ b/Zookeepers Trial/Library/metadata/00/00000000000000005000000000000000
--- a/Zookeepers Trial/Library/metadata/00/00000000000000005100000000000000
+++ b/Zookeepers Trial/Library/metadata/00/00000000000000005100000000000000
--- a/Zookeepers Trial/Library/metadata/00/00000000000000006000000000000000
+++ b/Zookeepers Trial/Library/metadata/00/00000000000000006000000000000000
--- a/Zookeepers Trial/Library/metadata/00/00000000000000007000000000000000
+++ b/Zookeepers Trial/Library/metadata/00/00000000000000007000000000000000
--- a/Zookeepers Trial/Library/metadata/00/00000000000000007100000000000000
+++ b/Zookeepers Trial/Library/metadata/00/00000000000000007100000000000000
--- a/Zookeepers Trial/Library/metadata/00/00000000000000008000000000000000
+++ b/Zookeepers Trial/Library/metadata/00/00000000000000008000000000000000
--- a/Zookeepers Trial/Library/metadata/00/00000000000000008100000000000000
+++ b/Zookeepers Trial/Library/metadata/00/00000000000000008100000000000000
--- a/Zookeepers Trial/Library/metadata/00/00000000000000009000000000000000
+++ b/Zookeepers Trial/Library/metadata/00/00000000000000009000000000000000
--- a/Zookeepers Trial/Library/metadata/00/0000000000000000a000000000000000
+++ b/Zookeepers Trial/Library/metadata/00/0000000000000000a000000000000000
--- a/Zookeepers Trial/Library/metadata/00/0000000000000000a100000000000000
+++ b/Zookeepers Trial/Library/metadata/00/0000000000000000a100000000000000
--- a/Zookeepers Trial/Library/metadata/00/0000000000000000b000000000000000
+++ b/Zookeepers Trial/Library/metadata/00/0000000000000000b000000000000000
--- a/Zookeepers Trial/Library/metadata/00/0000000000000000c000000000000000
+++ b/Zookeepers Trial/Library/metadata/00/0000000000000000c000000000000000
--- a/Zookeepers Trial/Library/metadata/25/25c26bc1a45b18a44b706f29a2982e7b.info
+++ b/Zookeepers Trial/Library/metadata/25/25c26bc1a45b18a44b706f29a2982e7b.info
--- a/Zookeepers Trial/Library/metadata/4e/4ec9fdb5433c77e42a52b913afc02243.info
+++ b/Zookeepers Trial/Library/metadata/4e/4ec9fdb5433c77e42a52b913afc02243.info
--- a/Zookeepers Trial/Library/metadata/5f/5f49e4fcbcde4414c9c327c4459bd16c.info
+++ b/Zookeepers Trial/Library/metadata/5f/5f49e4fcbcde4414c9c327c4459bd16c.info
--- a/Zookeepers Trial/Library/metadata/97/9724d12643e505b4c9cc6b9e5a380875.info
+++ b/Zookeepers Trial/Library/metadata/97/9724d12643e505b4c9cc6b9e5a380875.info