Ignore:
Timestamp:
2010-02-18T20:52:48+01:00 (14 years ago)
Author:
bastiK
Message:

pop up the conflict dialog when a conflict has been detected

File:
1 edited

Legend:

Unmodified
Added
Removed
Note: See TracChangeset for help on using the changeset viewer.