Commit dd83f998 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 f795cdbf
[Desktop Entry] [Desktop Entry]
Name=Comic Templates Name=Comic Templates
Name[ast]=Plantíes de comics
Name[bs]=Predlošci stripova Name[bs]=Predlošci stripova
Name[ca]=Plantilles per a còmics Name[ca]=Plantilles per a còmics
Name[ca@valencia]=Plantilles per a còmics Name[ca@valencia]=Plantilles per a còmics
[Desktop Entry] [Desktop Entry]
Icon=template_dslr Icon=template_dslr
Name=Nikon_D5000_4288x2848 Name=Nikon_D5000_4288x2848
Name[bs]=Nikon_D5000_4288x2848 Name[bs]=Nikon_D5000_4288x2848
Name[ca]=Nikon_D5000_4288x2848 Name[ca]=Nikon_D5000_4288x2848
Name[ca@valencia]=Nikon_D5000_4288x2848 Name[ca@valencia]=Nikon_D5000_4288x2848
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