Changes between Version 8 and Version 9 of Help/Dialog/Conflict


Ignore:
Timestamp:
2016-12-19T21:51:31+01:00 (9 years ago)
Author:
Klumbumbus
Comment:

remove dead interface link

Legend:

Unmodified
Added
Removed
Modified

  • Help/Dialog/Conflict

    v8 v9  
    11[[TranslatedPages(outdated=This page needs a review as the conflict dialog changed a bit and the member tab is not documented.)]]
    22= Conflict Dialog =
    3 [[PageOutline(1-10,,)]]
     3[[PageOutline(1-10,Table of Contents)]]
    44 
    55'''The Conflict Dialog is used to resolve [wiki:Help/Concepts/Conflict conflicts] between two [wiki:/Help/Concepts/Object versions] of an OSM object.'''
    … …  
    8888* Resolve conflicts by opening the 'conflicts' panel, selecting the one of the listed conflicts and choosing whether to accept 'theirs' or 'mine'.
    8989
    90 
    91 ----
    92 Back to [[JOSM interface]][[br]]
     90---
    9391Back to [wiki:Help Main Help]