[kernel] r19126 - dists/trunk/linux-2.6/debian

[Ben Hutchings]

Author: benh
Date: Mon Jun 11 04:47:30 2012
New Revision: 19126

Log:
Delete a merge conflict marker

Modified:
   dists/trunk/linux-2.6/debian/changelog

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Mon Jun 11 04:10:06 2012	(r19125)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Jun 11 04:47:30 2012	(r19126)
@@ -224,7 +224,6 @@
 
  -- Ben Hutchings <ben at 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: