resolve conflict

ls1intum · Jan 24, 2025 · 40ec9c9 · 40ec9c9
1 parent 0126a3a
commit 40ec9c9
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/...ge/exercise-groups/file-upload-exercise-cell/file-upload-exercise-group-cell.component.ts b/...ge/exercise-groups/file-upload-exercise-cell/file-upload-exercise-group-cell.component.ts
@@ -6,7 +6,6 @@ import { FileUploadExercise } from 'app/entities/file-upload-exercise.model';
     selector: 'jhi-file-upload-exercise-group-cell',
     templateUrl: './file-upload-exercise-group-cell.component.html',
     styles: [':host{display: contents}'],
-    standalone: true,
 })
 export class FileUploadExerciseGroupCellComponent {
     exerciseType = ExerciseType;

diff --git a/...ge/exercise-groups/programming-exercise-cell/programming-exercise-group-cell.component.ts b/...ge/exercise-groups/programming-exercise-cell/programming-exercise-group-cell.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnInit, inject } from '@angular/core';
+import { Component, OnInit, inject, input } from '@angular/core';
 import { HttpResponse } from '@angular/common/http';
 import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ProgrammingExerciseParticipationType } from 'app/entities/programming/programming-exercise-participation.model';

diff --git a/.../app/exam/manage/exercise-groups/quiz-exercise-cell/quiz-exercise-group-cell.component.ts b/.../app/exam/manage/exercise-groups/quiz-exercise-cell/quiz-exercise-group-cell.component.ts
@@ -6,7 +6,6 @@ import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model';
     selector: 'jhi-quiz-exercise-group-cell',
     templateUrl: './quiz-exercise-group-cell.component.html',
     styles: [':host{display: contents}'],
-    standalone: true,
 })
 export class QuizExerciseGroupCellComponent {
     exerciseType = ExerciseType;