From: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Date: Tue, 2 Oct 2018 13:18:52 +0000 (+0200)
Subject: merge conflicts
X-Git-Tag: 1.3.0~62^2~10^2~15
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/019459c71713b979cb4cc34ec3a91a947d2c235a

merge conflicts

Feature #14231

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
---

019459c71713b979cb4cc34ec3a91a947d2c235a
diff --cc src/views/workflow-panel/workflow-panel-view.tsx
index 8d21f335,c49ec88d..57654bc8
--- a/src/views/workflow-panel/workflow-panel-view.tsx
+++ b/src/views/workflow-panel/workflow-panel-view.tsx
@@@ -115,8 -121,8 +122,8 @@@ export const WorkflowPanelView = (props
                  dataTableDefaultView={<DataTableDefaultView icon={WorkflowIcon} />} />
          </Grid>
          <Grid item xs={6}>
 -            <Paper>
 +            <Paper style={{ height: '100%' }}>
-                 <WorkflowDetailsCard />
+                 <WorkflowDetailsCard workflow={props.workflow} />
              </Paper>
          </Grid>
      </Grid>;