Changes between Version 9 and Version 10 of Help/Dialog/Conflict
- Timestamp:
- 2016-12-19T21:51:43+01:00 (7 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
Help/Dialog/Conflict
v9 v10 88 88 * Resolve conflicts by opening the 'conflicts' panel, selecting the one of the listed conflicts and choosing whether to accept 'theirs' or 'mine'. 89 89 90 --- 90 ---- 91 91 Back to [wiki:Help Main Help]