From f74f866b81a02976338f0a9947f72f09dbae837d Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Thu, 2 Mar 2017 10:49:58 -0500 Subject: [PATCH] remove TeamHelper from messed up merge conflict fix --- awx/ui/client/src/app.js | 1 - 1 file changed, 1 deletion(-) diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js index 0830b0e651..095f216f59 100644 --- a/awx/ui/client/src/app.js +++ b/awx/ui/client/src/app.js @@ -140,7 +140,6 @@ var tower = angular.module('Tower', [ 'GroupListDefinition', 'TeamsListDefinition', 'TeamFormDefinition', - 'TeamHelper', 'TemplatesListDefinition', 'PortalJobTemplatesListDefinition', 'JobTemplateFormDefinition',