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

Merge branch 'master' into w2p-66156_Display-of-relations

Browse Source
This commit is contained in:
Kristof De Langhe
2019-11-19 14:01:22 +01:00
parent 558ff27d31 e2a2cad91b
commit 52e6d5ca29
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/i18n/en.json5
View File

@@ -415,13 +415,9 @@
"error.collections": "Error fetching collections", "error.collections": "Error fetching collections",
"error.community": "Error fetching community", "error.community": "Error fetching community",
<<<<<<< HEAD
"error.identifier": "No item found for the identifier",
=======
"error.identifier": "No item found for the identifier", "error.identifier": "No item found for the identifier",
>>>>>>> Merged new message keys from dspace/master and ran script again
"error.default": "Error", "error.default": "Error",
"error.item": "Error fetching item", "error.item": "Error fetching item",