fix merge

This commit is contained in:
Manuel Araoz 2014-04-24 18:59:24 -03:00
commit d98bc6f2e9

View file

@ -14,7 +14,7 @@ var copayApp = window.copayApp = angular.module('copay',[
'copay.socket', 'copay.socket',
'copay.controllerUtils', 'copay.controllerUtils',
'copay.setup', 'copay.setup',
'copay.directives' 'copay.directives',
'copay.video' 'copay.video'
]); ]);