From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Wed, 29 Nov 2006 17:35:00 +0000 (+0000)
Subject: r11324: fix format
X-Git-Tag: v1.96~10
X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=commitdiff_plain;h=363e2594e1bd702a77219fd53f9209ce7f486861;hp=f7b10efb816059b2dc9a6b63da2756b0364e50d1

r11324: fix format
---

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
diff --git a/debian/control b/debian/control
index f2cc7a9..ca0ec22 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Kevin M. Rosenberg <kmr@debian.org>
 Build-Depends: debhelper (>= 4.0.0)
-Standards-Version: 3.7.2.1
+Standards-Version: 3.7.2.2
 
 Package: cl-kmrcl
 Architecture: all