From d98bc6f2e90ce95055c0bafb9ec7c425136cde8b Mon Sep 17 00:00:00 2001
From: Manuel Araoz <manuelaraoz@gmail.com>
Date: Thu, 24 Apr 2014 18:59:24 -0300
Subject: [PATCH] fix merge

---
 js/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/app.js b/js/app.js
index f2b50d521..bcfce8f2c 100644
--- a/js/app.js
+++ b/js/app.js
@@ -14,7 +14,7 @@ var copayApp = window.copayApp = angular.module('copay',[
   'copay.socket',
   'copay.controllerUtils',
   'copay.setup',
-  'copay.directives'
+  'copay.directives',
   'copay.video'
 ]);