From 08e199bbde3fed97ea15696a3d112b03f05e416e Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Mon, 11 Jun 2012 04:47:30 +0000
Subject: [PATCH] Delete a merge conflict marker

svn path=/dists/trunk/linux-2.6/; revision=19126
---
 debian/changelog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 33c154102c04..eb10c320dcd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -224,7 +224,6 @@ linux-2.6 (3.2.17-1) unstable; urgency=low
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sat, 12 May 2012 15:29:09 +0100
 
->>>>>>> .merge-right.r19023
 linux-2.6 (3.2.16-1) unstable; urgency=low
 
   * New upstream stable update: