Commit 1e6dd479 authored by Script Kiddy's avatar Script Kiddy

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 a8442cce
[Desktop Entry]
Name=KClock_1x2
Name[x-test]=xxKClock_1x2xx
Comment=KClock widget (1x2)
Comment[x-test]=xxKClock widget (1x2)xx
Icon=kclock
......
[Desktop Entry]
Name=KClock_KWeather_3x3
Name[x-test]=xxKClock_KWeather_3x3xx
Comment=KClock widget (3x3 with Weather info)
Comment[x-test]=xxKClock widget (3x3 with Weather info)xx
Icon=kclock
......
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