02babfa36e
In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" |
||
---|---|---|
.. | ||
CMakeLists.txt | ||
detectwidget.cpp | ||
detectwidget.h | ||
detectwidget.ui | ||
editshortcut.ui | ||
kcm.cpp | ||
kcm.h | ||
kwinrules.desktop | ||
kwinsrc.cpp | ||
main.cpp | ||
Messages.sh | ||
ruleslist.cpp | ||
ruleslist.h | ||
ruleslist.ui | ||
ruleswidget.cpp | ||
ruleswidget.h | ||
ruleswidgetbase.ui | ||
yesnobox.h |