Commit e132c20
committed
Merge branch 'dspace-cris-2023_02_x' into dspace-cris-2023_02_x-DSC-1589
# Conflicts:
# src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.html
# src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts
# src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
# src/assets/i18n/en.json52 files changed
Lines changed: 2 additions & 2 deletions
File tree
- src
- app/item-page/orcid-page/orcid-sync-settings
- assets/i18n
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
54 | | - | |
| 54 | + | |
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6900 | 6900 | | |
6901 | 6901 | | |
6902 | 6902 | | |
6903 | | - | |
| 6903 | + | |
6904 | 6904 | | |
6905 | 6905 | | |
6906 | 6906 | | |
| |||
0 commit comments