[Pkg-samba-maint] r1311 - trunk/samba/debian

[Christian Perrier]

Author: bubulle
Date: 2007-04-01 15:10:50 +0000 (Sun, 01 Apr 2007)
New Revision: 1311

Modified:
   trunk/samba/debian/changelog
Log:
Remove conflict markers. Thanks, Julien.


Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2007-04-01 12:00:53 UTC (rev 1310)
+++ trunk/samba/debian/changelog	2007-04-01 15:10:50 UTC (rev 1311)
@@ -37,11 +37,7 @@
   * Norwegian Nynorsk added.
   * Marathi added. Closes: #416802
 
-<<<<<<< .mine
- -- Christian Perrier <bubulle at debian.org>  Sun, 01 Apr 2007 13:59:15 +0200
-=======
  -- Steve Langasek <vorlon at debian.org>  Wed, 21 Mar 2007 13:49:46 -0700
->>>>>>> .r1309
 
 samba (3.0.24-4) unstable; urgency=medium