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