From 851ba4834684254a4ee651494719d436df298487 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 24 Dec 2021 01:42:40 +0000 Subject: [PATCH] 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" --- shell/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/metadata.desktop b/shell/metadata.desktop index b8febd9c..d9da6045 100644 --- a/shell/metadata.desktop +++ b/shell/metadata.desktop @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2014 Aaron J. Seigo +# SPDX-FileCopyrightText: 2014 Aaron J. Seigo # SPDX-FileCopyrightText: 2019-2020 Marco Martin # SPDX-License-Identifier: GPL-2.0-or-later