From 19a8733a9ce3e0726495fb1dda2b83b6c436f50c Mon Sep 17 00:00:00 2001
From: Ivan Socolsky <jungans@gmail.com>
Date: Fri, 12 Sep 2014 10:28:16 -0300
Subject: [PATCH] resolved conflicts

---
 test/mocks/FakeWallet.js           | 2 ++
 test/unit/services/servicesSpec.js | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/mocks/FakeWallet.js b/test/mocks/FakeWallet.js
index 4ca6d3e2c..17be72584 100644
--- a/test/mocks/FakeWallet.js
+++ b/test/mocks/FakeWallet.js
@@ -84,6 +84,8 @@ FakeWallet.prototype.getAddressesInfo = function() {
   return ret;
 };
 
+FakeWallet.prototype.subscribeToAddresses = function() {};
+
 FakeWallet.prototype.isShared = function() {
   return this.totalCopayers > 1;
 }
diff --git a/test/unit/services/servicesSpec.js b/test/unit/services/servicesSpec.js
index 7541c26fd..9a5b73faf 100644
--- a/test/unit/services/servicesSpec.js
+++ b/test/unit/services/servicesSpec.js
@@ -113,7 +113,11 @@ describe('Unit: Rate Service', function() {
   beforeEach(module(function($provide) {
     $provide.value('request', {
       'get': function(_, cb) {
-        cb(null, null, [{name: 'lol currency', code: 'LOL', rate: 2}]);
+        cb(null, null, [{
+          name: 'lol currency',
+          code: 'LOL',
+          rate: 2
+        }]);
       }
     });
   }));