diff options
| author | Nick Merwin <[email protected]> | 2015-12-10 12:57:05 -0800 |
|---|---|---|
| committer | Nick Merwin <[email protected]> | 2015-12-10 12:57:05 -0800 |
| commit | b9c366a4d1eafce5d2c9cdf93ebd2a7b0eec574d (patch) | |
| tree | 3cf9b8e7296ca7d07ac7faa36fd2fd489241db83 /lib/convertLcovToCoveralls.js | |
| parent | 1b4d0a06585ee37a21551fe533e200a84a3ccd4f (diff) | |
| parent | fba900513bb8653d8d83b7c35053be72d519d5d6 (diff) | |
| download | node-coveralls-b9c366a4d1eafce5d2c9cdf93ebd2a7b0eec574d.tar.xz node-coveralls-b9c366a4d1eafce5d2c9cdf93ebd2a7b0eec574d.zip | |
merge conflict
Diffstat (limited to 'lib/convertLcovToCoveralls.js')
| -rw-r--r-- | lib/convertLcovToCoveralls.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/convertLcovToCoveralls.js b/lib/convertLcovToCoveralls.js index 896462e..a86dc4e 100644 --- a/lib/convertLcovToCoveralls.js +++ b/lib/convertLcovToCoveralls.js @@ -31,7 +31,7 @@ var convertLcovToCoveralls = function(input, options, cb){ if (err){ logger.error("error from lcovParse: ", err); logger.error("input: ", input); - return cb(err); + return cb(err); } var postJson = { source_files : [] @@ -48,7 +48,7 @@ var convertLcovToCoveralls = function(input, options, cb){ if (options.service_job_id){ postJson.service_job_id = options.service_job_id; } - if (options.service_pull_request){ + if (options.service_pull_request) { postJson.service_pull_request = options.service_pull_request; } if (options.repo_token) { @@ -114,4 +114,3 @@ example output from lcov parser: }, */ - |