resolve merge conflict

ls1intum · Jan 17, 2025 · 96ca7e1 · 96ca7e1
1 parent e0928ae
commit 96ca7e1
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/src/main/webapp/app/exam/participate/exam-participation.component.ts b/src/main/webapp/app/exam/participate/exam-participation.component.ts
@@ -62,6 +62,7 @@ import { JhiConnectionStatusComponent } from 'app/shared/connection-status/conne
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { ExamResultSummaryComponent } from './summary/exam-result-summary.component';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
+import { convertDateFromServer } from 'app/utils/date.utils';
 
 type GenerateParticipationStatus = 'generating' | 'failed' | 'success';