No subject

Updating 328344c..a9da867
error: Your local changes to the following files would be overwritten by me=
rge:
        libkdcraw/dcrawsettingswidget.cpp
Please, commit your changes or stash them before you can merge.
Aborting
myself at suseTower:/kde/kdesrc/git/kde/kdegraphics/libs/libkdcraw> git diff >
/kde/diffs/libkdcraw_i18nc_r1.patch
myself at suseTower:/kde/kdesrc/git/kde/kdegraphics/libs/libkdcraw> path -p0 <
/kde/diffs/libkdcraw_i18nc_r1.patch
myself at suseTower:/kde/kdesrc/git/kde/kdegraphics/libs/libkdcraw>

--=20
Configure bugmail: https://bugs.kde.org/userprefs.cgi?tab=3Demail
------- You are receiving this mail because: -------
You are the assignee for the bug.=