[Pkg-javascript-commits] [node-jsonstream] 213/214: merge patched into master

[Bastien Roucariès]

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

rouca pushed a commit to branch master
in repository node-jsonstream.

commit db7e50622726a56bf6a4d8f95b0faf5f81263c54
Merge: e488958 71ab561
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Fri Dec 1 13:47:59 2017 +0100

    merge patched into master

 debian/.git-dpm                       |  4 ++--
 debian/patches/0001-use-node-js.patch | 20 --------------------
 debian/patches/series                 |  1 -
 index.js                              |  2 +-
 4 files changed, 3 insertions(+), 24 deletions(-)

diff --cc debian/.git-dpm
index 664bf23,0000000..797e226
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- ab32cd6ee2a908fd6cb5c3f328b616fde1333a7a
- ab32cd6ee2a908fd6cb5c3f328b616fde1333a7a
++71ab5610d272bb47e64957e2191df6662ee64a90
++71ab5610d272bb47e64957e2191df6662ee64a90
 +71ab5610d272bb47e64957e2191df6662ee64a90
 +71ab5610d272bb47e64957e2191df6662ee64a90
 +node-jsonstream_1.3.1.orig.tar.gz
 +707f761e01dae9e16f1bcf93703b78c70966579a
 +138665

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