r42983 - /trunk/libconfig-inifiles-perl/debian/README.source

[js at users.alioth.debian.org]

Author: js
Date: Thu Aug 27 08:15:48 2009
New Revision: 42983

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=42983
Log:
Fix cleanup merge cruft in README.source.

Modified:
    trunk/libconfig-inifiles-perl/debian/README.source

Modified: trunk/libconfig-inifiles-perl/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-inifiles-perl/debian/README.source?rev=42983&op=diff
==============================================================================
--- trunk/libconfig-inifiles-perl/debian/README.source (original)
+++ trunk/libconfig-inifiles-perl/debian/README.source Thu Aug 27 08:15:48 2009
@@ -7,7 +7,6 @@
 Developing this package for Debian
 ----------------------------------
 
-<<<<<<< HEAD:debian/README.source
 The source of this package is developed using Subversion and the helper
 tool svn-buildpackage in mergeWithUpstream-mode.  This is documented
 below /usr/share/doc/svn-buildpackage/HOWTO.html/ .