From eba9578a0d875d068501174d4466d0eb0eed6ab0 Mon Sep 17 00:00:00 2001 From: YellOw139 <70975516+YellOw139@users.noreply.github.com> Date: Wed, 21 Oct 2020 07:30:18 +0300 Subject: [PATCH] More conflict changes. Should be ok now. --- core/assets/bundles/bundle_ro.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties index 270b894be7..32835e67b0 100644 --- a/core/assets/bundles/bundle_ro.properties +++ b/core/assets/bundles/bundle_ro.properties @@ -619,9 +619,9 @@ stat.reload = Lovituri/Secundă stat.ammo = Muniție stat.shieldhealth = Viața Scutului stat.cooldowntime = Timp de Reîncărcare -blocks.basedeflectchance = Șansa de Reflexie -blocks.lightningchance = Șansă Fulger -blocks.lightningdamage = Forță Fulger +stat.basedeflectchance = Șansa de Reflexie +stat.lightningchance = Șansă Fulger +stat.lightningdamage = Forță Fulger bar.drilltierreq = Burghiu Mai Bun Necesar bar.noresources = Resurse lipsă