[Pkg-samba-maint] r3955 - branches/samba/experimental/debian

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2011-10-29 06:53:24 +0000 (Sat, 29 Oct 2011)
New Revision: 3955

Modified:
   branches/samba/experimental/debian/changelog
Log:
Drop merge markers

Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog	2011-10-29 05:31:54 UTC (rev 3954)
+++ branches/samba/experimental/debian/changelog	2011-10-29 06:53:24 UTC (rev 3955)
@@ -80,7 +80,6 @@
 
  -- Steve Langasek <vorlon at debian.org>  Fri, 21 Oct 2011 20:00:13 +0000
 
->>>>>>> .fusion-droit.r3945
 samba (2:3.5.11~dfsg-2) unstable; urgency=low
 
   * Don't export DEB_HOST_ARCH_OS in debian/rules, this is only used locally.