Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/feature/communication/propose-fa…
Browse files Browse the repository at this point in the history
…q' into feature/communication/propose-faq

# Conflicts:
#	src/main/webapp/app/faq/faq.component.ts
  • Loading branch information
cremertim committed Oct 13, 2024
2 parents ba80f4e + 47e51cc commit 059a0b5
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/main/webapp/app/faq/faq.component.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Component, OnDestroy, OnInit, inject } from '@angular/core';
import { Faq, FaqState } from 'app/entities/faq.model';
import { faCancel, faCheck, faEdit, faFilter, faPencilAlt, faPlus, faSort, faTrash } from '@fortawesome/free-solid-svg-icons';
import { Subject } from 'rxjs';
import { map } from 'rxjs/operators';
import { BehaviorSubject, Subject } from 'rxjs';
import { debounceTime, map } from 'rxjs/operators';
import { AlertService } from 'app/core/util/alert.service';
import { ActivatedRoute } from '@angular/router';
import { FaqService } from 'app/faq/faq.service';
Expand All @@ -25,7 +25,7 @@ import { TranslateService } from '@ngx-translate/core';
templateUrl: './faq.component.html',
styleUrls: [],
standalone: true,
imports: [ArtemisSharedModule, CustomExerciseCategoryBadgeComponent, ArtemisSharedComponentModule, ArtemisMarkdownModule],
imports: [ArtemisSharedModule, CustomExerciseCategoryBadgeComponent, ArtemisSharedComponentModule, ArtemisMarkdownModule, SearchFilterComponent],
})
export class FaqComponent implements OnInit, OnDestroy {
protected readonly FaqState = FaqState;
Expand Down

0 comments on commit 059a0b5

Please sign in to comment.