Swerve Merge

Zookeepers Trial/Assets/Scripts/PlayerStats.cs

@@ -39,13 +39,12 @@ public class PlayerStats : MonoBehaviour {
 	EnterDoor spawn;
 
 	void Start() {
-<<<<<<< HEAD
-=======
+
 		if (!created) {
 			setDefaultStats();
 		}
 
->>>>>>> origin/master
+
         if (SceneManager.GetActiveScene().name == "arena") { // apply blessings
             heal(); // CHANGE THIS -- WILL AUTO HEAL THE CHARACTER ON ENTRY OF THE ARENA
             if (getOffenseBlessing() == true) {
@@ -59,14 +58,11 @@ public class PlayerStats : MonoBehaviour {
             if (getLuckBlessing() == true) {
                 luck += 2;
             }
-<<<<<<< HEAD
             
 			if (!created) {
 				setDefaultStats();
 			}
             
-=======
->>>>>>> origin/master
         }
 
         Debug.Log("Player Stats:\n\nname: " + playerName + "\nvit: " + vitality + "\nstr: " + strength + "\ndef: " + defense + "\nagi: " + agility + "\nluck: " + luck);

Zookeepers Trial/Library/LastSceneManagerSetup.txt

 sceneSetups:
-<<<<<<< HEAD
-<<<<<<< HEAD
 - path: Assets/Scenes/arena.unity
-=======
-- path: Assets/Scenes/Town01ToTown02.unity
->>>>>>> origin/master
-=======
-- path: Assets/Scenes/arena.unity
->>>>>>> origin/master
   isLoaded: 1
   isActive: 1