Changes between Version 11 and Version 12 of Help/Concepts/Conflict


Ignore:
Timestamp:
2009-10-07T21:36:55+02:00 (16 years ago)
Author:
Gubaer
Comment:

link fix

Legend:

Unmodified
Added
Removed
Modified

  • Help/Concepts/Conflict

    v11 v12  
    4141
    4242== Resolving conflicts ==
    43 Each data layer maintains a list of '''conflicts''' which are not resolved yet. You can consult this list in the [wiki:/Help/Dialog/ConflictListDialog Conflict List Dialog].
     43Each data layer maintains a list of '''conflicts''' which are not resolved yet. You can consult this list in the [wiki:/Help/Dialogs/ConflictListDialog Conflict List Dialog].
    4444For each '''conflict''' listed there you can (and should) launch the [wiki:/Help/Dialog/ConflictDialog Conflict Resolution Dialog] and resolve it.
    4545