clean up merge artifacts

Author: marlonnienaber

src/main/java/de/tum/cit/aet/artemis/lecture/web/LectureUnitResource.java

@@ -224,7 +224,7 @@ public ResponseEntity<Void> ingestLectureUnit(@PathVariable long lectureId, @Pat
             throw new BadRequestAlertException("Requested lecture unit is not part of the specified lecture", ENTITY_NAME, "lectureIdMismatch");
         }
         if (lectureUnit.getLecture().isTutorialLecture()) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).build();
+            throw new BadRequestAlertException("Units of tutorial lectures can not be ingested", ENTITY_NAME, "tutorialLectureIngestion");
         }
         if (!(lectureUnit instanceof AttachmentVideoUnit)) {
             throw new BadRequestAlertException("Only attachment video units can be ingested into Pyris", ENTITY_NAME, "invalidLectureUnitType");

src/main/webapp/app/lecture/manage/lecture-update/lecture-update.component.ts

@@ -1,37 +1,36 @@
 import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
 import { Component, OnDestroy, OnInit, computed, effect, inject, model, signal, viewChild } from '@angular/core';
+import { Observable, Subscription } from 'rxjs';
 import { FormsModule } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
-import { Lecture } from 'app/lecture/shared/entities/lecture.model';
-import { faCircleInfo } from '@fortawesome/free-solid-svg-icons';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
-import { faBan, faPuzzlePiece, faQuestionCircle, faSave } from '@fortawesome/free-solid-svg-icons';
+import { faBan, faCircleInfo, faPuzzlePiece, faQuestionCircle, faSave } from '@fortawesome/free-solid-svg-icons';
 import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
 import { captureException } from '@sentry/angular';
-import { CalendarService } from 'app/core/calendar/shared/service/calendar.service';
-import { LectureUpdatePeriodComponent } from 'app/lecture/manage/lecture-period/lecture-period.component';
-import { LectureUpdateUnitsComponent } from 'app/lecture/manage/lecture-units/lecture-units.component';
-import { DocumentationButtonComponent, DocumentationType } from 'app/shared/components/buttons/documentation-button/documentation-button.component';
 import { ACCEPTED_FILE_EXTENSIONS_FILE_BROWSER, ALLOWED_FILE_EXTENSIONS_HUMAN_READABLE } from 'app/shared/constants/file-extensions.constants';
-import { FormDateTimePickerComponent } from 'app/shared/date-time-picker/date-time-picker.component';
-import { FormSectionStatus, FormStatusBarComponent } from 'app/shared/form/form-status-bar/form-status-bar.component';
-import { TranslateDirective } from 'app/shared/language/translate.directive';
-import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
 import { FormulaAction } from 'app/shared/monaco-editor/model/actions/formula.action';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
-import { AlertService } from 'app/shared/service/alert.service';
 import { getCurrentLocaleSignal, onError } from 'app/shared/util/global.utils';
-import { ArtemisNavigationUtilService } from 'app/shared/util/navigation.utils';
 import dayjs, { Dayjs } from 'dayjs/esm';
 import cloneDeep from 'lodash-es/cloneDeep';
-import { SelectButtonModule } from 'primeng/selectbutton';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
+import { FormDateTimePickerComponent } from 'app/shared/date-time-picker/date-time-picker.component';
+import { FormSectionStatus, FormStatusBarComponent } from 'app/shared/form/form-status-bar/form-status-bar.component';
+import { LectureTitleChannelNameComponent } from '../lecture-title-channel-name/lecture-title-channel-name.component';
 import { LectureSeriesCreateComponent } from 'app/lecture/manage/lecture-series-create/lecture-series-create.component';
-import { TranslateService } from '@ngx-translate/core';
+import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
+import { LectureUpdatePeriodComponent } from 'app/lecture/manage/lecture-period/lecture-period.component';
+import { LectureUpdateUnitsComponent } from 'app/lecture/manage/lecture-units/lecture-units.component';
+import { DocumentationButtonComponent, DocumentationType } from 'app/shared/components/buttons/documentation-button/documentation-button.component';
+import { SelectButtonModule } from 'primeng/selectbutton';
 import { CheckboxModule } from 'primeng/checkbox';
 import { TooltipModule } from 'primeng/tooltip';
-import { Observable, Subscription } from 'rxjs';
-import { LectureTitleChannelNameComponent } from '../lecture-title-channel-name/lecture-title-channel-name.component';
+import { TranslateService } from '@ngx-translate/core';
+import { CalendarService } from 'app/core/calendar/shared/service/calendar.service';
 import { LectureService } from '../services/lecture.service';
+import { AlertService } from 'app/shared/service/alert.service';
+import { ArtemisNavigationUtilService } from 'app/shared/util/navigation.utils';
+import { Lecture } from 'app/lecture/shared/entities/lecture.model';
 
 export enum LectureCreationMode {
     SINGLE = 'single',