553b6d39c6
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 | ||
| thumbnailaside.cpp | ||
| thumbnailaside.h | ||
| thumbnailaside.kcfg | ||
| thumbnailaside_config.cpp | ||
| thumbnailaside_config.desktop | ||
| thumbnailaside_config.h | ||
| thumbnailaside_config.ui | ||
| thumbnailasideconfig.kcfgc | ||