From 4bc9a26c4c3afcb564fa8d3cea5311304359448f Mon Sep 17 00:00:00 2001 From: FinnStutzenstein Date: Fri, 3 Feb 2017 08:40:48 +0100 Subject: [PATCH] Fixing merge conflicts (fixes #2927) --- openslides/assignments/static/js/assignments/site.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openslides/assignments/static/js/assignments/site.js b/openslides/assignments/static/js/assignments/site.js index 197bb9177..0f103511b 100644 --- a/openslides/assignments/static/js/assignments/site.js +++ b/openslides/assignments/static/js/assignments/site.js @@ -258,7 +258,7 @@ angular.module('OpenSlidesApp.assignments.site', [ 'AssignmentPhases', function($scope, ngDialog, AssignmentForm, Assignment, Tag, Agenda, Projector, ProjectionDefault, gettextCatalog, AssignmentContentProvider, AssignmentCatalogContentProvider, PdfMakeDocumentProvider, - User, osTableFilter, osTableSort, gettext, phases, PdfCreate, AssignmentPhases) { + User, osTableFilter, osTableSort, gettext, PdfCreate, AssignmentPhases) { Assignment.bindAll({}, $scope, 'assignments'); Tag.bindAll({}, $scope, 'tags'); $scope.$watch(function () { @@ -405,7 +405,7 @@ angular.module('OpenSlidesApp.assignments.site', [ 'PdfCreate', 'AssignmentPhases', function($scope, $http, $filter, filterFilter, gettext, ngDialog, AssignmentForm, operator, Assignment, - User, assignmentId, phases, Projector, ProjectionDefault, AssignmentContentProvider, BallotContentProvider, + User, assignmentId, Projector, ProjectionDefault, AssignmentContentProvider, BallotContentProvider, PdfMakeDocumentProvider, PdfMakeBallotPaperProvider, gettextCatalog, PdfCreate, AssignmentPhases) { var assignment = Assignment.get(assignmentId); User.bindAll({}, $scope, 'users');