From 86af0368b84eab6dfe2944e1c9210194423dae23 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 15 Nov 2019 12:29:52 -0600
Subject: [PATCH] Remove bad characters from en.json5

---
 resources/i18n/en.json5 | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/resources/i18n/en.json5 b/resources/i18n/en.json5
index d2f5b1e8f6..caaf169c66 100644
--- a/resources/i18n/en.json5
+++ b/resources/i18n/en.json5
@@ -415,13 +415,9 @@
   "error.collections": "Error fetching collections",
 
   "error.community": "Error fetching community",
-<<<<<<< HEAD
-  "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.item": "Error fetching item",