Commit Graph

5 Commits

Author SHA1 Message Date
l10n daemon script fb8249cbc9 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"
2022-01-15 01:46:27 +00:00
l10n daemon script 55f525d5a4 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"
2022-01-14 01:48:45 +00:00
l10n daemon script 1430b89952 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"
2022-01-13 01:45:47 +00:00
l10n daemon script 28df23863e 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"
2022-01-12 01:49:44 +00:00
Nate Graham 4703517c75 Add an "Open in Partition Manager" solid Action
This lets you open a device in Partition Manager from the Disks &
Devices applet.

BUG: 446897
FIXED-IN: 22.04
2022-01-10 22:21:40 +00:00