Resolve merge conflicts
authorMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Tue, 10 Jul 2018 13:20:15 +0000 (15:20 +0200)
committerMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Tue, 10 Jul 2018 13:20:15 +0000 (15:20 +0200)
commitf5e55e7a71f2fc2390d392af752c61b4d3135cb6
tree9c775f71734d699d5fba41a3344ea5d033cbe8d0
parent2a3330b84782b9fac42f16a8644f442d06906b21
parent808b1f59d53a83c9ad456931c7e38f127b4d8342
Resolve merge conflicts

Feature #13694

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>
src/components/data-explorer/data-explorer.tsx
src/components/data-table/data-table.tsx
src/views-components/data-explorer/data-explorer.tsx
src/views/project-panel/project-panel.tsx
src/views/workbench/workbench.tsx