[Pkg-javascript-commits] [node-coveralls] 235/332: 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-coveralls.

commit b9c366a4d1eafce5d2c9cdf93ebd2a7b0eec574d
Merge: 1b4d0a0 fba9005
Author: Nick Merwin <n at mer.io>
Date:   Thu Dec 10 12:57:05 2015 -0800

    merge conflict

 lib/convertLcovToCoveralls.js | 5 ++---
 lib/getOptions.js             | 5 +++++
 test/getOptions.js            | 2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --cc lib/convertLcovToCoveralls.js
index 896462e,394ab9e..a86dc4e
--- a/lib/convertLcovToCoveralls.js
+++ b/lib/convertLcovToCoveralls.js
@@@ -31,7 -31,7 +31,7 @@@ var convertLcovToCoveralls = function(i
      if (err){
        logger.error("error from lcovParse: ", err);
        logger.error("input: ", input);
--      return cb(err); 
++      return cb(err);
      }
      var postJson = {
        source_files : []
@@@ -114,4 -111,4 +114,3 @@@ example output from lcov parser
          },
  
  */
--

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