hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-10 11:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

CST-5249_suggestion alignment to main, merge conflicts

Browse Source
This commit is contained in:
frabacche
2023-12-21 12:44:12 +01:00
parent 9b556fd703 92a10ce9de
commit 108db1e0c5
509 changed files with 16021 additions and 5203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/admin/admin-notifications/admin-notifications.module.ts
View File

@@ -7,7 +7,7 @@ import { AdminNotificationsSuggestionTargetsPageComponent } from './admin-notifi
import { AdminQualityAssuranceTopicsPageComponent } from './admin-quality-assurance-topics-page/admin-quality-assurance-topics-page.component';
import { AdminQualityAssuranceEventsPageComponent } from './admin-quality-assurance-events-page/admin-quality-assurance-events-page.component';
import { AdminQualityAssuranceSourcePageComponent } from './admin-quality-assurance-source-page-component/admin-quality-assurance-source-page.component';
import {SuggestionNotificationsModule} from '../../suggestion-notifications/suggestion-notifications.module';
import { NotificationsModule } from '../../notifications/notifications.module';
@NgModule({
imports: [
@@ -15,7 +15,7 @@ import {SuggestionNotificationsModule} from '../../suggestion-notifications/sugg
SharedModule,
CoreModule.forRoot(),
AdminNotificationsRoutingModule,
SuggestionNotificationsModule
NotificationsModule
],
declarations: [
AdminNotificationsSuggestionTargetsPageComponent,