Fixing merge conflicts

This commit is contained in:
Glitchfinder
2013-01-06 17:59:31 -08:00
30 changed files with 191 additions and 107 deletions

View File

@ -77,8 +77,8 @@ Skills:
Bleed_MaxBonusLevel: 750
Bleed_MaxTicks: 3
Bleed_BaseTicks: 2
CounterAttack_ChanceMax: 30
CounterAttack_MaxBonusLevel: 600
Counter_ChanceMax: 30
Counter_MaxBonusLevel: 600
Counter_DamageModifier: 2
SerratedStrikes_DamageModifier: 4
SerratedStrikes_BleedTicks: 5