[Pkg-javascript-commits] [node-argparse] 02/02: Fix copyright

[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 9675e285ace35baa5e439a42626d6c1effb66110
Merge: 02cf68d 5eaef97
Author: Matthew Pideil <matthewp_debian at teledetection.fr>
Date:   Mon Mar 16 09:56:55 2015 +0100

    Fix copyright

 debian/copyright | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --cc debian/copyright
index c45dca0,4c079b8..6f49db5
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,10 -1,10 +1,19 @@@
  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