X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=debian%2Fchangelog;h=85a2f41d30bb080a082001af8871eed58d9fd37d;hp=c66c71c4835d97f5792d10a53bfddd88ac3e8673;hb=363e2594e1bd702a77219fd53f9209ce7f486861;hpb=f7b10efb816059b2dc9a6b63da2756b0364e50d1

diff --git a/debian/changelog b/debian/changelog
index c66c71c..85a2f41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,6 @@ cl-kmrcl (1.91-1) unstable; urgency=low
 
  -- Kevin M. Rosenberg <kmr@debian.org>  Tue, 24 Oct 2006 20:45:19 -0600
 
->>>>>>> .r11322
 cl-kmrcl (1.90-1) unstable; urgency=low
 
   * New upstream