From 2eef16632512f72fc47a2a2169b0fdfb05ad7085 Mon Sep 17 00:00:00 2001 From: gconsidine Date: Fri, 9 Feb 2018 14:30:17 -0500 Subject: [PATCH] Remove git merge conflict artifacts --- awx/ui/client/lib/models/index.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/awx/ui/client/lib/models/index.js b/awx/ui/client/lib/models/index.js index 3875975d4d..809b6a72ba 100644 --- a/awx/ui/client/lib/models/index.js +++ b/awx/ui/client/lib/models/index.js @@ -60,7 +60,6 @@ angular .service('UnifiedJobTemplateModel', UnifiedJobTemplate) .service('WorkflowJobModel', WorkflowJob) .service('WorkflowJobTemplateModel', WorkflowJobTemplate) - .service('WorkflowJobTemplateNodeModel', WorkflowJobTemplateNode) - .service('ModelsStrings', ModelsStrings); + .service('WorkflowJobTemplateNodeModel', WorkflowJobTemplateNode); export default MODULE_NAME;