From 581e1759c499ad4861000a9091f4272b11bef437 Mon Sep 17 00:00:00 2001 From: Peer Richelsen Date: Thu, 1 Jun 2023 16:47:43 +0100 Subject: [PATCH] chore: prevent merge conflicts in common.json (#9268) --- apps/web/public/static/locales/en/common.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json index 56f2af5481..369d5bcaf0 100644 --- a/apps/web/public/static/locales/en/common.json +++ b/apps/web/public/static/locales/en/common.json @@ -1841,5 +1841,6 @@ "google_workspace_admin_tooltip":"You must be a Workspace Admin to use this feature", "first_event_type_webhook_description": "Create your first webhook for this event type", "create_for": "Create for", - "additional_url_parameters":"Additional URL parameters" + "additional_url_parameters": "Additional URL parameters", + "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Add your new strings above here ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑" }