Commit 4fca10c5 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 22cba2e3
Pipeline #50750 skipped
......@@ -57,6 +57,7 @@ Comment[x-test]=xxKOrganizer UserFeedBack Configurationxx
X-KDE-Keywords=korganizer,userfeedback
X-KDE-Keywords[ca]=korganizer,userfeedback
X-KDE-Keywords[ca@valencia]=korganizer,userfeedback
X-KDE-Keywords[de]=KOrganizer,feedback
X-KDE-Keywords[el]=korganizer,userfeedback
X-KDE-Keywords[en_GB]=korganizer,userfeedback
X-KDE-Keywords[es]=korganizer,comentarios del usuario
......
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