Imported Upstream version 0.6.0
[debian/confclerk.git] / src / gui / conflictsdialog.ui
2011-06-29 gregor herrmann[svn-inject] Installing original source of confclerk... upstream/0.5.0