merge conflict

2 files changed, 7 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:
         },
 
 */
-
diff --git a/lib/getOptions.js b/lib/getOptions.js
index 350af68..144d0ad 100644
--- a/lib/getOptions.js
+++ b/lib/getOptions.js
@@ -42,6 +42,11 @@ var getBaseOptions = function(cb){
   if (process.env.CIRCLECI){
     options.service_name = 'circleci';
     options.service_job_id = process.env.CIRCLE_BUILD_NUM;
+
+    if (process.env.CI_PULL_REQUEST) {
+      var pr = process.env.CI_PULL_REQUEST.split('/pull/');
+      options.service_pull_request = pr[1];
+    }
     git_commit = process.env.CIRCLE_SHA1;
     git_branch = process.env.CIRCLE_BRANCH;
   }