merga main

onon1101 · May 14, 2024 · 1c48057 · 1c48057
1 parent 727a569
commit 1c48057
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/src/Dungeon/Enemies/DragonGreen.cpp b/src/Dungeon/Enemies/DragonGreen.cpp
@@ -29,11 +29,9 @@ DragonGreen::DragonGreen(
     InitHealth(6);
     SetDamage(1);
     SetCoin(2);
-<<<<<<< HEAD
+
     m_SkeletonNormalFrames = m_NormalFrames;
     m_SkeletonShadowFrames = m_ShadowFrames;
-=======
->>>>>>> main
 
     m_Attack = false;
 }
@@ -59,7 +57,6 @@ void DragonGreen::Move() {
         }
     }
     m_Attack = !m_Attack;
-<<<<<<< HEAD
     UpdateProperties();
 }
 
@@ -73,8 +70,4 @@ void DragonGreen::UpdateProperties() {
     }
     m_SpriteSheet->SetFrames(GetShadow() ? m_ShadowFrames : m_NormalFrames);
 }
-=======
-}
-
->>>>>>> main
 }  // namespace Dungeon::Enemies