16ccd123dd
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" |
5 years ago | |
|---|---|---|
| .. | ||
| CMakeLists.txt | ||
| Messages.sh | ||
| menu.cpp | ||
| menu.h | ||
| plasma-containmentactions-lattecontextmenu.desktop | 5 years ago | |