From b26d4e783e32356d2ea61c2d0d73808e8dbb363b Mon Sep 17 00:00:00 2001
From: Manfred Brandl <manfred@brandl.net>
Date: Mon, 27 Jul 2020 10:32:11 +0200
Subject: [PATCH] Update core.yaml

Unite into line 873
---
 data/core.yaml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/data/core.yaml b/data/core.yaml
index 80d36ba07..1cb8d7a50 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -870,10 +870,7 @@ en:
       delete: Leave Deleted
       download_changes: Or download osmChange file
       done: "All conflicts resolved!"
-      help: |
-        Another user changed some of the same map features you changed.
-        Click on each feature below for more details about the conflict, and choose whether to keep
-        your changes or the other user's changes.
+      help: "Another user changed some of the same map features you changed. Click on each feature below for more details about the conflict, and choose whether to keep your changes or the other user's changes."
   merge_remote_changes:
     conflict:
       deleted: 'This feature has been deleted by {user}.'