Viewing all changes in revision 743.
- Committer: l10n daemon script
- Date: 2015-04-03 04:49:23 UTC
- Revision ID: git-v1:02ad51dc4e3e914cb1232f4db6b984c55d5d1f8d
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"
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"
- files modified:
- devdoc/helloworld/homerun-source-helloworld.desktop
expand all
collapse all
added
removed
