Commit 6c611826 authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent e1ad33c6
[Desktop Entry]
Exec=ibus-ui-emojier-plasma
Name=Emoji Selector
Name[ca]=Selector dels emoji
Name[lt]=Jaustukų parinkiklis
Name[nl]=Emoji selectieprogramma
Name[pt]=Selector de Emojis
Name[uk]=Вибір емодзі
Name[x-test]=xxEmoji Selectorxx
OnlyShowIn=KDE;
Type=Application
Icon=preferences-desktop-emoticons
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment