From: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Date: Mon, 3 Sep 2018 09:45:58 +0000 (+0200)
Subject: merge conflict
X-Git-Tag: 1.3.0~123^2
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/fc3d9ac09fbb1cdc4fb4b00f2f704795ad365110

merge conflict

Feature #13859

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

fc3d9ac09fbb1cdc4fb4b00f2f704795ad365110
diff --cc src/views/process-panel/process-information-card.tsx
index db0ee605,f3a804d7..f2379ed8
--- a/src/views/process-panel/process-information-card.tsx
+++ b/src/views/process-panel/process-information-card.tsx
@@@ -94,8 -94,8 +94,8 @@@ export const ProcessInformationCard = w
                      </div>
                  }
                  title={
-                     <Tooltip title={process.containerRequest.name}>
-                         <Typography noWrap variant="title" color='inherit'>
 -                    <Tooltip title={process.containerRequest.name} placement="bottom-start">
++                    <Tooltip title={process.containerRequest.name} placement="bottom-start" color='inherit'>
+                         <Typography noWrap variant="title">
                             {process.containerRequest.name}
                          </Typography>
                      </Tooltip>