[Pkg-mysql-commits] r973 - branches/etch-5.0/debian

[Christian Hammers]

Author: ch
Date: 2007-11-06 23:53:21 +0000 (Tue, 06 Nov 2007)
New Revision: 973

Modified:
   branches/etch-5.0/debian/changelog
Log:
a leftover svn thing


Modified: branches/etch-5.0/debian/changelog
===================================================================
--- branches/etch-5.0/debian/changelog	2007-11-06 22:49:39 UTC (rev 972)
+++ branches/etch-5.0/debian/changelog	2007-11-06 23:53:21 UTC (rev 973)
@@ -92,8 +92,6 @@
 
 mysql-dfsg-5.0 (5.0.32-4) unstable; urgency=high
 
-=======
->>>>>>> .merge-right.r875
   [Christian Hammers]
   * Changed minimum required version in dh_makeshlibs to 5.0.27-1 as
     5.0.26 had an ABI breakage in it!