Commit d825cc09 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 b7baf684
[Desktop Entry]
Exec=xsettings-kde
Name=XSettings-KDE
Name[cs]=XSettings-KDE
Name[de]=XSettings-KDE
Name[es]=XSettings-KDE
Name[fi]=XSettings-KDE
Name[fr]=XSettings-KDE
Name[gl]=XSettings-KDE
Name[it]=XSettings-KDE
Name[nl]=XSettings-KDE
Name[pl]=XSettings-KDE
Name[pt]=XSettings-KDE
Name[pt_BR]=XSettings-KDE
Name[sk]=XSettings-KDE
Name[sv]=XSettings-KDE
Name[uk]=XSettings-KDE
Name[x-test]=xxXSettings-KDExx
X-KDE-autostart-after=kdesktop
X-KDE-autostart-phase=1
Type=Service
......
Supports Markdown
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