Fix merge [skip ci]

This commit is contained in:
Michael Cook (mackal) 2016-09-21 23:54:51 -04:00
parent b15ada974f
commit b04844aa94

View File

@ -76,7 +76,6 @@ mackal: Instant spells now have instrument mods
mackal: Rate limit character saves mackal: Rate limit character saves
mackal: Made it so items no longer do TGB (Live-like) Rule implemented to disable mackal: Made it so items no longer do TGB (Live-like) Rule implemented to disable
mackal: Set pet buffs limit to 30 mackal: Set pet buffs limit to 30
>>>>>>> upstream/master
== 09/03/2016 == == 09/03/2016 ==
Uleat: Changed 'Bind Wound' behavior to match the best references that I could find for post-2004 era. Uleat: Changed 'Bind Wound' behavior to match the best references that I could find for post-2004 era.