fix conflicts

This commit is contained in:
flisowna
2022-11-02 15:19:35 +04:00
350 changed files with 14005 additions and 16829 deletions

View File

@@ -19,7 +19,7 @@ export const viewIcons: Record<number | string, { icon: any; color: string }> =
view: { icon: MdiEyeIcon, color: 'blue' },
}
export const viewTypeAlias = {
export const viewTypeAlias: Record<number, string> = {
[ViewTypes.GRID]: 'grid',
[ViewTypes.FORM]: 'form',
[ViewTypes.GALLERY]: 'gallery',