mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 18:14:17 +00:00
Resolve conflicts after merge of part 1
This commit is contained in:
@@ -26,6 +26,9 @@ import { FilterVocabularyConfig } from './filter-vocabulary-config';
|
||||
import { DiscoverySortConfig } from './discovery-sort.config';
|
||||
import { QualityAssuranceConfig } from './quality-assurance.config';
|
||||
import { SearchConfig } from './search-page-config.interface';
|
||||
import {
|
||||
AdminNotifyMetricsRow
|
||||
} from "../app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model";
|
||||
interface AppConfig extends Config {
|
||||
ui: UIServerConfig;
|
||||
rest: ServerConfig;
|
||||
@@ -55,6 +58,7 @@ interface AppConfig extends Config {
|
||||
comcolSelectionSort: DiscoverySortConfig;
|
||||
qualityAssuranceConfig: QualityAssuranceConfig;
|
||||
search: SearchConfig;
|
||||
notifyMetrics: AdminNotifyMetricsRow[];
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user