Fixed merge errors

2022-05-05 15:37:51 +07:00
parent 1cf5776a1b
commit cfb7b71a8a
4 changed files with 0 additions and 89 deletions
--- a/Assets/Scripts/Character/CharacterCondition.cs
+++ b/Assets/Scripts/Character/CharacterCondition.cs
@ -9,22 +9,12 @@ public class CharacterCondition
    public event Action<int> OnChangeAmmunitionEvent;

    private int health;
-<<<<<<< HEAD
    public int HealthPoints
    {
        get
        {
            return health;
        }
-=======
-
-    public int HealthPoints 
-    { 
-        get 
-        { 
-            return health; 
-        } 
->>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467
        private set
        {
            health = value;