Changes between Version 14 and Version 15 of Help/Dialog/Conflict


Ignore:
Timestamp:
2020-01-28T04:28:33+01:00 (6 years ago)
Author:
skyper
Comment:

backlink instead of "see also"

Legend:

Unmodified
Added
Removed
Modified

  • Help/Dialog/Conflict

    v14 v15  
    8787* Resolve conflicts by opening the 'conflicts' panel, selecting the one of the listed conflicts and choosing whether to accept 'theirs' or 'mine'.
    8888
    89 == See also ==
    90 * [wikitr:/Help/Dialog/ConflictList Conflict List Dialog]
    91 
    9289----
     90Back to [wikitr:/Help/Dialog/ConflictList Conflict List Dialog][[BR]]
    9391Back to [wikitr:/Help/Concepts/Conflict Conflict][[BR]]
    9492Back to [wikitr:/Help Main Help]