github-forks
/
latte-dock
mirror of https://github.com/KDE/latte-dock.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
latte-dock/applets/spacer/package
History
l10n daemon script bc93683d25 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
..
contents add mouse indicators for hidden scrolling actions
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours