From e8687e052786f2e9f6cd29cfe8b6af85a15f635b Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Mon, 2 Feb 2015 17:24:56 -0300
Subject: [PATCH] fix merge

---
 lib/model/copayer.js | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/lib/model/copayer.js b/lib/model/copayer.js
index 2ba89f2..f70e648 100644
--- a/lib/model/copayer.js
+++ b/lib/model/copayer.js
@@ -33,23 +33,6 @@ Copayer.prototype.getSigningPubKey = function () {
   return HDPublicKey.fromString(this.xPubKey).derive(MESSAGE_SIGNING_PATH).publicKey.toString();
 };
 
-Copayer.prototype.addAddress = function (isChange) {
-  if (isChange) {
-    this.changeAddressIndex++;
-  } else {
-    this.receiveAddressIndex++;
-  }
-};
-
-Copayer.prototype.getCurrentAddressPath = function (isChange) {
-  return 
-};
-
-Copayer.prototype.getNewAddressPath = function (isChange) {
-  this.addAddress(isChange);
-  return this.currentAddressPath(isChange);
-};
-
 Copayer.fromObj = function (obj) {
   var x = new Copayer();