External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-10-30 06:13:24 -02:30
Code Issues Packages Projects Releases Wiki Activity

Remove git merge conflict artifacts

Browse Source
This commit is contained in:
gconsidine
2018-04-04 16:03:42 -04:00
committed by Jake McDermott
parent a6ee7b6aac
commit 2eef166325
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
awx/ui/client/lib/models/index.js
+1 -2
View File
@@ -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;