fix conflicts

This commit is contained in:
Mario Colque 2014-04-20 17:18:20 -03:00
commit 74f7271310
28 changed files with 653 additions and 761 deletions

View file

@ -34,7 +34,6 @@ angular.module('copay.setup').controller('SetupController',
};
var w = walletFactory.create(opts);
controllerUtils.setupUxHandlers(w);
w.netStart();
};
});