From e9ade72fab189144ad35076ba149fb236d11b08a Mon Sep 17 00:00:00 2001
From: Leigh Johnson <ljohnson@redhat.com>
Date: Wed, 27 Apr 2016 13:34:43 -0400
Subject: [PATCH] resolve incorrect merge conflict in rev
 14d956c132889690580d7c92f7ccdf7e164d9931, resolves #1715

---
 .../directive/manage-groups.directive.controller.js       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/awx/ui/client/src/inventories/manage/manage-groups/directive/manage-groups.directive.controller.js b/awx/ui/client/src/inventories/manage/manage-groups/directive/manage-groups.directive.controller.js
index cfe8c8efeb..11c81355bc 100644
--- a/awx/ui/client/src/inventories/manage/manage-groups/directive/manage-groups.directive.controller.js
+++ b/awx/ui/client/src/inventories/manage/manage-groups/directive/manage-groups.directive.controller.js
@@ -60,12 +60,12 @@ function manageGroupsDirectiveController($filter, $location, $log,
 
     $scope.parseType = 'yaml';
 
-    generator.inject(GroupForm, {
+    generator.inject(form, {
         mode: mode,
-        id: 'properties-tab',
-        related: false,
+        id: 'group-manage-panel',
         scope: $scope,
-        cancelButton: false,
+        related: false,
+        cancelButton: false
     });
 
     generator.reset();