From b04844aa946d86776512460e4bd4315eed211ddf Mon Sep 17 00:00:00 2001
From: "Michael Cook (mackal)" <mcook@mackal.net>
Date: Wed, 21 Sep 2016 23:54:51 -0400
Subject: [PATCH] Fix merge [skip ci]

---
 changelog.txt | 1 -
 1 file changed, 1 deletion(-)

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