fix conflics

This commit is contained in:
Matias Alejo Garcia 2014-06-17 16:25:38 -03:00
commit cd71ce4421
25 changed files with 268 additions and 122 deletions

View file

@ -1,7 +1,7 @@
'use strict';
angular.module('copayApp.controllers').controller('HeaderController',
function($scope, $rootScope, $location, $notification, $http, walletFactory, controllerUtils) {
function($scope, $rootScope, $location, $notification, $http, controllerUtils) {
$scope.menu = [
{
'title': 'Addresses',