marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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"
This commit is contained in:
l10n daemon script 2021-12-24 01:42:40 +00:00
parent 81a60255f6
commit 851ba48346
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
shell/metadata.desktop
View file

@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2014 Aaron J. Seigo
# SPDX-FileCopyrightText: 2014 Aaron J. Seigo
# SPDX-FileCopyrightText: 2019-2020 Marco Martin <mart@kde.org>
# SPDX-License-Identifier: GPL-2.0-or-later