External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-14 04:47:44 -02:30
Code Issues Packages Projects Releases Wiki Activity

resolve incorrect merge conflict in rev 14d956c132889690580d7c92f7ccdf7e164d9931, resolves #1715

Browse Source
This commit is contained in:
Leigh Johnson
2016-04-27 13:34:43 -04:00
parent ce14c0daff
commit e9ade72fab
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/ui/client/src/inventories/manage/manage-groups/directive/manage-groups.directive.controller.js
View File

@@ -60,12 +60,12 @@ function manageGroupsDirectiveController($filter, $location, $log,
$scope.parseType = 'yaml'; $scope.parseType = 'yaml';
generator.inject(GroupForm, { generator.inject(form, {
mode: mode, mode: mode,
id: 'properties-tab', id: 'group-manage-panel',
related: false,
scope: $scope, scope: $scope,
cancelButton: false, related: false,
cancelButton: false
}); });
generator.reset(); generator.reset();