Viewing all changes in revision 19592.
- Committer: scripty
- Date: 2015-04-03 04:48:25 UTC
- Revision ID: svn-v4:283d02a7-25f6-0310-bc7c-ecb5cbfe19da:trunk/kdesupport:1421027
SVN_SILENT made messages (.desktop file) - always resolve mine-conflict
In case of conflict in i18n, keep the version of the branch "--accept mine-conflict"
To resolve a particular conflict, "svn resolve --accept mine-full path/to/file.desktop"
In case of conflict in i18n, keep the version of the branch "--accept mine-conflict"
To resolve a particular conflict, "svn resolve --accept mine-full path/to/file.desktop"
- files modified:
- oxygen-icons/index.theme
expand all
collapse all
added
removed
