97dde989c3
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 | ||
main.cpp | ||
metadata.json | ||
org.kde.KWin.ScreenShot2.xml | ||
screenshot.cpp | ||
screenshot.h | ||
screenshotdbusinterface1.cpp | ||
screenshotdbusinterface1.h | ||
screenshotdbusinterface2.cpp | ||
screenshotdbusinterface2.h |