CSCEXAM-000 Fix merge failures

CSCfi · Dec 22, 2023 · 7e24157 · 7e24157
1 parent 6ca8a73
commit 7e24157
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/ui/src/app/calendar/helpers/slot-picker.component.ts b/ui/src/app/calendar/helpers/slot-picker.component.ts
@@ -108,7 +108,7 @@ export class SlotPickerComponent implements OnInit, OnChanges {
         if (!this.selectedRoom) {
             return;
         }
-        const start = DateTime.fromISO($event.date, { zone: $event.timeZone }).startOf('week') as DateTime<true>;
+        const start = DateTime.fromISO($event.date, { zone: $event.timeZone }).startOf('week');
         this.currentWeek = start;
         const accessibilities = this.accessibilities.filter((i) => i.filtered).map((i) => i.id);
 

diff --git a/ui/src/app/question/library/library.component.ts b/ui/src/app/question/library/library.component.ts
@@ -23,7 +23,6 @@ import { AttachmentService } from 'src/app/shared/attachment/attachment.service'
 import { FileService } from 'src/app/shared/file/file.service';
 import type { Question, Tag } from '../../exam/exam.model';
 import type { User } from '../../session/session.service';
-import { LibraryFileExportComponent } from './export/library-file-export.component';
 import { LibraryTransferDialogComponent } from './export/library-transfer-dialog.component';
 import { LibraryOwnersDialogComponent } from './owners/library-owners-dialog.component';
 import { LibraryResultsComponent } from './results/library-results.component';
@@ -162,7 +161,6 @@ import { LibraryTagsDialogComponent } from './tags/library-tags-dialog.component
         LibrarySearchComponent,
         LibraryOwnersDialogComponent,
         LibraryTransferDialogComponent,
-        LibraryFileExportComponent,
         LibraryResultsComponent,
         TranslateModule,
     ],