fix conflicts
This commit is contained in:
commit
64fc2dd22b
13 changed files with 209 additions and 5827 deletions
17
js/app.js
17
js/app.js
|
|
@ -2,15 +2,24 @@
|
|||
|
||||
angular.module('cosign',[
|
||||
'ngRoute',
|
||||
'ui.bootstrap',
|
||||
'mm.foundation',
|
||||
'monospaced.qrcode',
|
||||
'cosign.header',
|
||||
'cosign.home',
|
||||
'cosign.transactions',
|
||||
'cosign.send',
|
||||
'cosign.backup',
|
||||
'cosign.network',
|
||||
'cosign.signin',
|
||||
'cosign.join',
|
||||
'cosign.network'
|
||||
'cosign.join'
|
||||
]);
|
||||
|
||||
angular.module('cosign.header', []);
|
||||
angular.module('cosign.home', []);
|
||||
angular.module('cosign.transactions', []);
|
||||
angular.module('cosign.send', []);
|
||||
angular.module('cosign.backup', []);
|
||||
angular.module('cosign.network', []);
|
||||
angular.module('cosign.signin', []);
|
||||
angular.module('cosign.join', []);
|
||||
angular.module('cosign.network', []);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue