[Pkg-javascript-commits] [node-module-deps] 187/444: merge 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-module-deps.

commit 003a00903d5502cd6bb229e905bfdc652ad589e2
Merge: 08e1de1 da7e73c
Author: James Halliday <mail at substack.net>
Date:   Thu Apr 10 21:21:46 2014 -0700

    merge conflict


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