Diffusion KEuroCalc d26eedeaedbe

SVN_SILENT made messages (.desktop file) - always resolve mine-conflict
d26eedeaedbe
Actions

Authored by Script Kiddy <scripty@kde.org> on Jul 12 2018, 12:07 AM.

Description

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"

svn path=/trunk/extragear/utils/keurocalc/; revision=1519610

Details

Committed
Script Kiddy <scripty@kde.org>Jul 12 2018, 12:07 AM
Parents
R1024:c94e3c654bf6: Fix XML
Branches
Unknown
Tags
Unknown
Script Kiddy <scripty@kde.org> committed R1024:d26eedeaedbe: SVN_SILENT made messages (.desktop file) - always resolve mine-conflict (authored by Script Kiddy <scripty@kde.org>).Jul 12 2018, 12:07 AM

Changes (1)

PathPackages
Mkeurocalc/keurocalc.desktop

R1024:d26eedeaedbe

View Options

keurocalc/keurocalc.desktop

Loading...