[Pkg-javascript-commits] [node-argparse] 01/01: Now right copyright fix

[matthew pideil]

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

mpideil-guest pushed a commit to branch master
in repository node-argparse.

commit e3f7b3e7599c1b52d6fa1a03b9ecfe96605b0b9d
Author: Matthew Pideil <matthewp_debian at teledetection.fr>
Date:   Mon Mar 16 10:00:46 2015 +0100

    Now right copyright fix
---
 debian/copyright | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 6f49db5..c45dca0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,19 +1,10 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-<<<<<<< HEAD
 Upstream-Name: argparse
 Upstream-Contact: https://github.com/nodeca/argparse/issues
 Source: https://github.com/nodeca/argparse
 
 Files: *
 Copyright: 2012 Vitaly Puzrin <vitaly at rcdesign.ru> (https://github.com/puzrin)
-=======
-Upstream-Name: lodash
-Upstream-Contact: https://github.com/lodash/lodash/issues
-Source: https://lodash.com/
-
-Files: *
-Copyright: 2015 John-David Dalton <john.david.dalton at gmail.com> (http://allyoucanleet.com/)
->>>>>>> 5eaef976606b037e982927fc568b3629bba37550
 License: Expat
 
 Files: debian/*

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-argparse.git