[Reproducible-commits] [dpkg] 03/03: dpkg-buildpackage: remove merge artifact

[HW42]

This is an automated email from the git hooks/post-receive script.

hw42-guest pushed a commit to branch pu/reproducible_builds
in repository dpkg.

commit 410fc5b2bacc8a6190acab3c5681582a9b29710c
Author: HW42 <hw42 at ipsumj.de>
Date:   Wed Jul 20 17:38:05 2016 +0200

    dpkg-buildpackage: remove merge artifact
---
 scripts/dpkg-buildpackage.pl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index b54b83f..3f61768 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -63,7 +63,6 @@ sub usage {
 'Usage: %s [<option>...]')
     . "\n\n" . g_(
 'Options:
-<<<<<<< HEAD
       --build=<type>[,...]    specify the build <type>: full, source, binary,
                                 any, all (default is \'full\').
   -F                          normal full build (source and binary; default).

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git