From 20b20ba613f05bf82ef2ea2c232fc1aa364dd6bb Mon Sep 17 00:00:00 2001
From: Jovan Gerodetti <jovan.gerodetti@titannano.de>
Date: Fri, 13 Nov 2015 09:12:08 +0100
Subject: [PATCH] fix for a wrong merge conflic resolve

---
 app/js/directives.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/js/directives.js b/app/js/directives.js
index b86e3b62..4630ac58 100755
--- a/app/js/directives.js
+++ b/app/js/directives.js
@@ -1429,7 +1429,8 @@ angular.module('myApp.directives', ['myApp.filters'])
 
   })
 
-  .directive('mySendForm', function (_, $timeout, $compile, $modalStack, $http, $interpolate, Storage, AppStickersManager, AppDocsManager, ErrorService, shouldFocusOnInteraction) {
+  .directive('mySendForm', function (_, $window, $compile, $modalStack, $http, $interpolate, Storage, AppStickersManager, AppDocsManager, ErrorService, shouldFocusOnInteraction) {
+
     return {
       link: link,
       scope: {