Commit 6859a72c 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 6428f85f
...@@ -28,6 +28,7 @@ Name[pt]=LabPlot2 ...@@ -28,6 +28,7 @@ Name[pt]=LabPlot2
Name[pt_BR]=LabPlot2 Name[pt_BR]=LabPlot2
Name[ru]=LabPlot2 Name[ru]=LabPlot2
Name[sk]=LabPlot2 Name[sk]=LabPlot2
Name[sv]=Labplot 2 Name[sv]=Labplot 2
Name[tr]=LabPlot2 Name[tr]=LabPlot2
Name[uk]=LabPlot2 Name[uk]=LabPlot2
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