71acd12eb2
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" |
||
|---|---|---|
| .. | ||
| desktopchangeosd | ||
| enforcedeco | ||
| minimizeall | ||
| synchronizeskipswitcher | ||
| videowall | ||
| CMakeLists.txt | ||
| Messages.sh | ||