From 45ca9976f3e364638ad667ef3a48ef28234f9103 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Thu, 3 Sep 2020 15:34:07 -0400
Subject: [PATCH] Fix merge conflict error

---
 awx/ui_next/src/screens/Job/Job.jsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/awx/ui_next/src/screens/Job/Job.jsx b/awx/ui_next/src/screens/Job/Job.jsx
index b62e110494..e5692ad261 100644
--- a/awx/ui_next/src/screens/Job/Job.jsx
+++ b/awx/ui_next/src/screens/Job/Job.jsx
@@ -18,7 +18,6 @@ import RoutedTabs from '../../components/RoutedTabs';
 import useRequest from '../../util/useRequest';
 import JobDetail from './JobDetail';
 import JobOutput from './JobOutput';
-import WorkflowDetail from './WorkflowDetail';
 import { WorkflowOutput } from './WorkflowOutput';
 import useWsJob from './useWsJob';
 import { JOB_TYPE_URL_SEGMENTS } from '../../constants';
@@ -47,7 +46,7 @@ function Job({ i18n, lookup, setBreadcrumb }) {
     jobType = JOB_TYPE_URL_SEGMENTS[job.type];
   }
 
-const tabsArray = [
+  const tabsArray = [
     {
       name: (
         <>
@@ -98,7 +97,7 @@ const tabsArray = [
           {job &&
             job.type === 'workflow_job' && [
               <Route key="workflow-details" path="/jobs/workflow/:id/details">
-                <WorkflowDetail job={job} />
+                <JobDetail type={match.params.type} job={job} />
               </Route>,
               <Route key="workflow-output" path="/jobs/workflow/:id/output">
                 <WorkflowOutput job={job} />