249aeeccb4
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" |
4 years ago | |
|---|---|---|
| .. | ||
| default | ||
| org.kde.latte.plasma | 4 years ago | |
| org.kde.latte.plasmatabstyle | ||
| CMakeLists.txt | ||
| Messages.sh | ||