Commit 3e262702 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 8be71742
......@@ -54,4 +54,4 @@
],
"Version": "0.1"
}
}
\ No newline at end of file
}
......@@ -54,4 +54,4 @@
],
"Version": "0.1"
}
}
\ 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