Commit 2544fa7a 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 3c018ad1
......@@ -61,6 +61,7 @@ Comment[ko]=KDevelop 세션과 일치함
Comment[nb]=Treffer KDevelop-økter
Comment[nds]=Kiekt na passen KDevelop-Törns
Comment[nl]=Komt overeen met KDevelop sessies
Comment[nn]=Søk etter KDevelop-økter
Comment[pl]=Dopasowuje sesje KDevelop
Comment[pt]=Corresponde às Sessões do KDevelop
Comment[pt_BR]=Corresponder às sessões do KDevelop
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