merge master
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Mon, 20 Aug 2018 13:15:22 +0000 (15:15 +0200)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Mon, 20 Aug 2018 13:15:22 +0000 (15:15 +0200)
Feature #13988

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

1  2 
src/views/workbench/workbench.tsx

index 084e9bbc0d720171cc729f550b558eb16ae6cc87,4d0adf15184ccff1e9d210e9e5dc15bb00832eca..d84119e2b0c725715175fe1f6cd35b1367c9587f
@@@ -51,7 -51,7 +51,8 @@@ import { MoveToProjectDialog } from '..
  import { COLLECTION_CREATE_DIALOG } from '~/views-components/dialog-create/dialog-collection-create';
  import { PROJECT_CREATE_DIALOG } from '~/views-components/dialog-create/dialog-project-create';
  import { UploadCollectionFilesDialog } from '~/views-components/upload-collection-files-dialog/upload-collection-files-dialog';
 +import { MakeACopyToProjectDialog } from '~/views-components/make-a-copy-dialog/make-a-copy-dialog';
+ import { CollectionPartialCopyDialog } from '../../views-components/collection-partial-copy-dialog/collection-partial-copy-dialog';
  
  const DRAWER_WITDH = 240;
  const APP_BAR_HEIGHT = 100;