[Pkg-javascript-commits] [node-module-deps] 107/444: fixed 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 46e5d462625689a3827b570e3dc33041eb763a14
Merge: 383e740 155a80f
Author: James Halliday <mail at substack.net>
Date:   Sun Jun 23 00:43:57 2013 -0700

    fixed conflict

 index.js | 1 +
 1 file changed, 1 insertion(+)


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