fix conflicts

This commit is contained in:
Mario Colque 2014-03-31 18:05:35 -03:00
commit 92f4422841
26 changed files with 1811 additions and 331 deletions

11
js/controllers/peer.js Normal file
View file

@ -0,0 +1,11 @@
'use strict';
angular.module('copay.peer').controller('PeerController',
function($scope, $rootScope, $location, $routeParams, Network) {
$scope.init = function() {
console.log('connecting peer init');
//Network.connect($rootScope.masterId);
};
});