Fix merge problem

This commit is contained in:
Andy Armstrong
2014-07-15 14:47:44 -04:00
committed by cahrens
parent 436d773987
commit 538ce6d478

View File

@@ -1,8 +1,8 @@
define([
'js/views/baseview', 'underscore', 'jquery', 'gettext',
'js/views/group_edit'
'js/views/group_edit', 'js/views/utils/view_utils'
],
function(BaseView, _, $, gettext, GroupEdit) {
function(BaseView, _, $, gettext, GroupEdit, ViewUtils) {
'use strict';
var GroupConfigurationEdit = BaseView.extend({
tagName: 'div',
@@ -112,7 +112,7 @@ function(BaseView, _, $, gettext, GroupEdit) {
return false;
}
this.runOperationShowingMessage(
ViewUtils.runOperationShowingMessage(
gettext('Saving') + '…',
function () {
var dfd = $.Deferred();