fix conflicts
This commit is contained in:
commit
92f4422841
26 changed files with 1811 additions and 331 deletions
11
js/controllers/peer.js
Normal file
11
js/controllers/peer.js
Normal 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);
|
||||
};
|
||||
});
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue