fixed conflicts
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Wed, 21 Nov 2018 15:14:05 +0000 (16:14 +0100)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Wed, 21 Nov 2018 15:14:05 +0000 (16:14 +0100)
commite4b54c3b5d99c99553e319ead28c3aa8dcd6eecc
tree4b0173cb243865b3e7761d7f1d93c6bb9da88bd4
parent9bfdbacc69b6ccbcedd07b3d906efbac6e192202
parentda61c0b626bfef292175bb0c623213cb1efad63d
fixed conflicts

Feature #13864

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
src/components/icon/icon.tsx
src/models/resource.ts
src/routes/route-change-handlers.ts
src/routes/routes.ts
src/services/services.ts
src/store/navigation/navigation-action.ts
src/store/store.ts
src/store/workbench/workbench-actions.ts
src/views-components/main-app-bar/account-menu.tsx
src/views-components/main-content-bar/main-content-bar.tsx
src/views/workbench/workbench.tsx