Changes between Version 27 and Version 28 of Help/Dialog/Conflict


Ignore:
Timestamp:
2024-10-08T09:31:07+02:00 (14 months ago)
Author:
leni
Comment:

replace tag with propertie in the properties paragraph

Legend:

Unmodified
Added
Removed
Modified

  • Help/Dialog/Conflict

    v27 v28  
    4848
    4949The table in the middle now displays the values to keep and the background color turns green. Selected values in the middle table can be cleared again with the button below the table ([[JOSMImage(dialogs/conflict/tagundecide)]]).\\
    50 Once all tag conflicts are solved the green check mark ([[JOSMImage(misc/green_check,link=,top)]]) is displayed in front of the name of the tab and if there are no further conflicts in other tabs the button [[JOSMImage(dialogs/conflict)]] **Apply Resolution** is enabled you can apply your decision. The values you've chosen will be applied and the dialog will be closed.
     50Once all propertie conflicts are solved the green check mark ([[JOSMImage(misc/green_check,link=,top)]]) is displayed in front of the name of the tab and if there are no further conflicts in other tabs the button [[JOSMImage(dialogs/conflict)]] **Apply Resolution** is enabled you can apply your decision. The values you've chosen will be applied and the dialog will be closed.
    5151
    5252[[Image(propertie-resolve-3_v19207.png,60%,center)]]