Fix merge conflicts

nyambati · May 2, 2016 · 918b163 · 918b163
2 parents 775d8ac + 80dc5e8
commit 918b163
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/coveralls.yml b/coveralls.yml
@@ -0,0 +1,2 @@
+service_name: travis-pro
+repo_token: Hqeh358NfAm8VCbvq06Pmv4Zru1Nq3p4c
diff --git a/tests/nacl.authorize.glob.spec.js b/tests/nacl.authorize.glob.spec.js
@@ -137,6 +137,7 @@
         assert.deepEqual(data.success, false);
         assert.deepEqual(data.error, 'ACCESS DENIED');
 
+
         done();
       });
     });