From b3bee77c177d5f5b51147deedb75cca621ce01ff Mon Sep 17 00:00:00 2001 From: Bernhard Reiter Date: Mon, 28 Jun 2021 15:22:56 +0200 Subject: [PATCH] Change license from Apache-2.0 to BSD-3-Clause to match the license of vdirsyncer --- contrib/conflict_resolution/resolve_interactively.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/conflict_resolution/resolve_interactively.py b/contrib/conflict_resolution/resolve_interactively.py index 09e06ff..7d0e1c3 100755 --- a/contrib/conflict_resolution/resolve_interactively.py +++ b/contrib/conflict_resolution/resolve_interactively.py @@ -12,7 +12,7 @@ Usage: conflict_resolution = ["command", "/home/bern/vdirsyncer/resolve_interactively.py"] This file is Free Software under the following license: -SPDX-License-Identifier: Apache-2.0 +SPDX-License-Identifier: BSD-3-Clause SPDX-FileCopyrightText: 2021 Intevation GmbH Author: """