Skip to content

Commit

Permalink
Merge branch 'task-788-typescriptize-library-files' into task-810-rep…
Browse files Browse the repository at this point in the history
…lace-deprecated-buttons

# Conflicts:
#	jsapp/js/components/library/myLibraryRoute.tsx
  • Loading branch information
magicznyleszek committed Jun 19, 2024
2 parents 52dae9d + abff73a commit 3e92521
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion jsapp/js/components/library/myLibraryRoute.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import myLibraryStore from './myLibraryStore';
import AssetsTable from 'js/components/assetsTable/assetsTable';
import {MODAL_TYPES} from 'js/constants';
import {ROOT_BREADCRUMBS} from 'js/components/library/libraryConstants';
import pageState from 'js/pageState.store';
import {AssetsTableContextName} from 'js/components/assetsTable/assetsTableConstants';
import pageState from 'js/pageState.store';
import type {MyLibraryStoreData} from './myLibraryStore';
import type {OrderDirection} from 'js/projects/projectViews/constants';
import type {FileWithPreview} from 'react-dropzone';
Expand Down

0 comments on commit 3e92521

Please sign in to comment.