[Pkg-octave-commit] r2695 - octave/trunk/debian

[Rafael Laboissiere]

Author: rafael
Date: 2009-02-25 14:51:21 +0000 (Wed, 25 Feb 2009)
New Revision: 2695

Modified:
   octave/trunk/debian/changelog
Log:
Remove bogus line left by svn merge

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2009-02-24 23:57:33 UTC (rev 2694)
+++ octave/trunk/debian/changelog	2009-02-25 14:51:21 UTC (rev 2695)
@@ -40,7 +40,6 @@
 
  -- Rafael Laboissiere <rafael at debian.org>  Thu, 19 Feb 2009 01:19:02 +0100
 
->>>>>>> .r2693
 octave3.0 (1:3.0.4~rc4-1) experimental; urgency=low
 
   * New upstream release candidate.  Although lenny is already released,