Commit c1b2b9dc 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 852faa0a
......@@ -16,4 +16,4 @@
],
"Version": "1.0"
}
}
}
\ No newline at end of file
......@@ -23,4 +23,4 @@
],
"Version": "1.0"
}
}
}
\ No newline at end of file
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