fix merge

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();