[Pkg-javascript-commits] [node-coveralls] 270/332: fixed package conflict

[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-coveralls.

commit 9a3d84c7cf7a881d8872f43b7203ab2f79eb133b
Merge: a87354b 95c4dfd
Author: Nick Merwin <n at mer.io>
Date:   Thu Sep 15 10:04:45 2016 -0700

    fixed package conflict

 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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