Changes between Version 2 and Version 3 of Help/Concepts/Conflict


Ignore:
Timestamp:
2009-10-06T20:57:37+02:00 (16 years ago)
Author:
Gubaer
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • Help/Concepts/Conflict

    v2 v3  
    3232== See also ==
    3333
    34  * [wiki:/help/Dialog/ConflictDialog Conflict Dialog] - You can use the conflict dialog to resolve a conflict
     34 * [wiki:/Help/Dialog/ConflictDialog Conflict Dialog] - You can use the conflict dialog to resolve a conflict
    3535
    3636