removed a mergeconflic line fuck up.

Siccity · Feb 25, 2018 · 1804029 · 1804029
1 parent 3f62a11
commit 1804029
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Assets/Scripts/CharacterMovement.cs b/Assets/Scripts/CharacterMovement.cs
@@ -211,7 +211,7 @@ void OnTriggerEnter(Collider col)
         }
     }
 
-    private void ResetCharacter(){
+
     private void ResetCharacterOnLevelLoad(){
         ResetPosition();
         if (KeyObject != null && HasKey){