Commit e578270b 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 c950593c
......@@ -10,6 +10,7 @@ Name[en_GB]=NIC
Name[es]=NIC
Name[et]=NIC
Name[eu]=NIC
Name[fi]=Verkkokortti
Name[fr]=NIC
Name[hu]=NIC
Name[ia]=NIC
......
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