From b384204219dededa850bb82aa89813802b412a44 Mon Sep 17 00:00:00 2001
From: Nicolas Stepien <mayhemydg@gmail.com>
Date: Sun, 24 Jul 2011 07:17:36 +0200
Subject: [PATCH] Fix merge

---
 changelog | 2 --
 1 file changed, 2 deletions(-)

diff --git a/changelog b/changelog
index c33640d5f..2fa1a4866 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,4 @@
 github
-
-2.16.1
 - mayhem:
   - Make updater's settings dynamic