From 414e29f23eeb855dde7752eda65d8c81760317f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Wed, 9 Jan 2013 00:17:26 +0100
Subject: [PATCH] remove merge conflict marker

---
 Changelog.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 4a3ad824a..1921d4501 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # 0.0.3.0
 
 ## Refactor