Commit f6424adc 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 f4504f47
......@@ -170,6 +170,7 @@ X-KDE-Keywords=Markdown
X-KDE-Keywords[ca]=Markdown
X-KDE-Keywords[ca@valencia]=Markdown
X-KDE-Keywords[cs]=Markdown
X-KDE-Keywords[de]=Markdown
X-KDE-Keywords[el]=Markdown
X-KDE-Keywords[es]=Markdown
X-KDE-Keywords[fr]=Markdown
......
......@@ -159,6 +159,7 @@ X-KDE-Keywords=Markdown
X-KDE-Keywords[ca]=Markdown
X-KDE-Keywords[ca@valencia]=Markdown
X-KDE-Keywords[cs]=Markdown
X-KDE-Keywords[de]=Markdown
X-KDE-Keywords[el]=Markdown
X-KDE-Keywords[es]=Markdown
X-KDE-Keywords[fr]=Markdown
......
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