From 60a6f6f2f6eaa364495e33eeae7907c09a78a672 Mon Sep 17 00:00:00 2001 From: negue Date: Sun, 30 Sep 2018 15:37:14 +0200 Subject: [PATCH] fix merge issues --- website/common/errors/apiErrorMessages.js | 2 -- website/common/locales/en/messages.json | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/website/common/errors/apiErrorMessages.js b/website/common/errors/apiErrorMessages.js index 0f5331e3f1..5690cdfe9d 100644 --- a/website/common/errors/apiErrorMessages.js +++ b/website/common/errors/apiErrorMessages.js @@ -25,6 +25,4 @@ module.exports = { missingCustomerId: 'Missing "req.query.customerId"', missingPaypalBlock: 'Missing "req.session.paypalBlock"', missingSubKey: 'Missing "req.query.sub"', - - messageIdRequired: '\"messageId\" must be a valid UUID.",', }; diff --git a/website/common/locales/en/messages.json b/website/common/locales/en/messages.json index ea4a299b7c..2f9c72733b 100644 --- a/website/common/locales/en/messages.json +++ b/website/common/locales/en/messages.json @@ -71,6 +71,6 @@ "beginningOfConversation": "This is the beginning of your conversation with <%= userName %>. Remember to be kind, respectful, and follow the Community Guidelines!", - "messageDeletedUser": "Sorry, this user has deleted their account." + "messageDeletedUser": "Sorry, this user has deleted their account.", "reportedMessage": "You have reported this message to moderators." }