Changes between Version 29 and Version 30 of Help/Concepts/Conflict


Ignore:
Timestamp:
2019-12-26T22:18:50+01:00 (6 years ago)
Author:
skyper
Comment:

added one icon

Legend:

Unmodified
Added
Removed
Modified

  • Help/Concepts/Conflict

    v29 v30  
    5151
    5252== See also ==
    53 * [wikitr:/Help/Dialog/ConflictList Conflict List Dialog] - displays the list of conflicts in the current data layer
     53* [[Image(source:/trunk/images/dialogs/conflict.png,middle)]] [wikitr:/Help/Dialog/ConflictList Conflict List Dialog] - displays the list of conflicts in the current data layer
    5454* [wikitr:/Help/Dialog/Conflict Conflict Dialog] - you can use the conflict dialog to resolve a conflict
    5555