Commit 023d9584 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 e7c8bf5c
Pipeline #180571 skipped
......@@ -93,6 +93,7 @@ Query=https://datatracker.ietf.org/doc/\\{@}
Query[ca]=https://datatracker.ietf.org/doc/\\{@}
Query[es]=https://datatracker.ietf.org/doc/\\{@}
Query[fr]=https://datatracker.ietf.org/doc/\\{@}
Query[it]=https://datatracker.ietf.org/doc/\\{@}
Query[nl]=https://datatracker.ietf.org/doc/\\{@}
Query[pt]=https://datatracker.ietf.org/doc/\\{@}
Query[sl]=https://datatracker.ietf.org/doc/\\{@}
......
Supports Markdown
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