[Pkg-xfce-commits] r7311 - desktop/branches/experimental/orage/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2013-02-17 19:13:31 +0000 (Sun, 17 Feb 2013)
New Revision: 7311

Modified:
   desktop/branches/experimental/orage/debian/changelog
Log:
and fix spurious merge files


Modified: desktop/branches/experimental/orage/debian/changelog
===================================================================
--- desktop/branches/experimental/orage/debian/changelog	2013-02-17 19:12:38 UTC (rev 7310)
+++ desktop/branches/experimental/orage/debian/changelog	2013-02-17 19:13:31 UTC (rev 7311)
@@ -6,7 +6,6 @@
 
  -- Yves-Alexis Perez <corsac at debian.org>  Mon, 17 Sep 2012 23:52:46 +0200
 
-=======
 orage (4.8.4-1) unstable; urgency=low
 
   * New upstream release.
@@ -21,7 +20,6 @@
 
  -- Yves-Alexis Perez <corsac at debian.org>  Sat, 02 Feb 2013 10:27:49 +0100
 
->>>>>>> .merge-right.r7309
 orage (4.8.3-2) unstable; urgency=low
 
   * debian/patches: