CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-13 01:02:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7848 from manfredbrandl/remove-cr-lr-from-data-core-yaml

Browse Source 
Update core.yaml
This commit is contained in:
Quincy Morgan
2020-07-27 15:38:37 -04:00
committed by GitHub
parent 54f42cf2a8 b26d4e783e
commit cd7dc6fca0
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
data/core.yaml
View File

@@ -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}.'