Browse Source

fix for a wrong merge conflic resolve

master
Jovan Gerodetti 9 years ago
parent
commit
20b20ba613
  1. 3
      app/js/directives.js

3
app/js/directives.js

@ -1429,7 +1429,8 @@ angular.module('myApp.directives', ['myApp.filters']) @@ -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: {

Loading…
Cancel
Save