r11324: fix format

diff --git a/debian/changelog b/debian/changelog
index c66c71c4835d97f5792d10a53bfddd88ac3e8673..85a2f41d30bb080a082001af8871eed58d9fd37d 100644 (file)
--- 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 f2cc7a9b6b641f9ac61ad748bb3f8639705b98ce..ca0ec2295c5e00eb0a883859cfa9240945280034 100644 (file)
--- 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