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"
This commit is contained in:
parent
faca8f7f0d
commit
66ded3229d
|
@ -4,6 +4,7 @@
|
||||||
{
|
{
|
||||||
"Email": "vl@fidra.de",
|
"Email": "vl@fidra.de",
|
||||||
"Name": "Volker Lanz",
|
"Name": "Volker Lanz",
|
||||||
|
"Name[ast]": "Volker Lanz",
|
||||||
"Name[ca@valencia]": "Volker Lanz",
|
"Name[ca@valencia]": "Volker Lanz",
|
||||||
"Name[ca]": "Volker Lanz",
|
"Name[ca]": "Volker Lanz",
|
||||||
"Name[cs]": "Volker Lanz",
|
"Name[cs]": "Volker Lanz",
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
{
|
{
|
||||||
"Email": "andrius@stikonas.eu",
|
"Email": "andrius@stikonas.eu",
|
||||||
"Name": "Andrius Štikonas",
|
"Name": "Andrius Štikonas",
|
||||||
|
"Name[ast]": "Andrius Štikonas",
|
||||||
"Name[ca@valencia]": "Andrius Štikonas",
|
"Name[ca@valencia]": "Andrius Štikonas",
|
||||||
"Name[ca]": "Andrius Štikonas",
|
"Name[ca]": "Andrius Štikonas",
|
||||||
"Name[cs]": "Andrius Štikonas",
|
"Name[cs]": "Andrius Štikonas",
|
||||||
|
|
Loading…
Reference in New Issue