mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 10:04:11 +00:00
CST-11012 fixed conflicts
This commit is contained in:
@@ -20,8 +20,8 @@ export class FooterComponent {
|
||||
showEndUserAgreement = environment.info.enableEndUserAgreement;
|
||||
coarLdnEnabled: boolean;
|
||||
|
||||
constructor(
|
||||
@Optional() private cookies: KlaroService,
|
||||
constructor(@Optional()
|
||||
private cookies: KlaroService,
|
||||
private notifyInfoService: NotifyInfoService
|
||||
) {
|
||||
this.notifyInfoService.isCoarConfigEnabled().subscribe(coarLdnEnabled => {
|
||||
|
@@ -3617,7 +3617,7 @@
|
||||
|
||||
"repository.image.logo": "Repository logo",
|
||||
|
||||
"repository.title.prefix": "Demo of COAR Notify in DSpace 7 :: ",
|
||||
"repository.title.prefix": "DSpace Angular :: ",
|
||||
|
||||
"repository.title.prefixDSpace": "DSpace Angular ::",
|
||||
|
||||
|
Reference in New Issue
Block a user