From afcb4b036ab0f1cde31297ddc37a8da11ecccc5e Mon Sep 17 00:00:00 2001
From: Jordan Bates <saudrapsmann@gmail.com>
Date: Fri, 26 Apr 2013 13:34:29 -0700
Subject: [PATCH] Update changelog

---
 CHANGELOG.md | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d516a1bd..d38a8cd67 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,8 @@
-<<<<<<< HEAD
 seaweedchan:
 - Fix emoji and favicon previews not updating on change.
-=======
-- Fix bug where a thread would freeze on load.
 
-### 3.2.1 - *2013-04-26*
->>>>>>> mayhem/v3
+MayhemYDG:
+- Fix bug where a thread would freeze on load.
 
 ### 1.1.1 - 2013-04-26
 zixaphir: