resolved merge conflicts

2022-05-05 16:49:21 +07:00
parent 6514599f22
commit ba1b350c62
4 changed files with 0 additions and 89 deletions
--- a/Assets/Scripts/Character/CharacterCondition.cs
+++ b/Assets/Scripts/Character/CharacterCondition.cs
@ -9,14 +9,6 @@ public class CharacterCondition
    public event Action<int> OnChangeAmmunitionEvent;

    private int health;
-<<<<<<< HEAD
-    public int HealthPoints
-    {
-        get
-        {
-            return health;
-        }
-=======

    public int HealthPoints 
    { 
@ -24,7 +16,6 @@ public class CharacterCondition
        { 
            return health; 
        } 
->>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467
        private set
        {
            health = value;