Merge pull request #2918 from nextcloud/lint

tobiasKaminsky · web-flow · commit 138a7a0e5b0a · 2025-11-14T09:03:24.000+01:00
Lint
diff --git a/.github/workflows/QA_keystore.jks.license b/.github/workflows/QA_keystore.jks.license
@@ -1,2 +1,2 @@
 SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
-SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/.github/workflows/lib.sh.license b/.github/workflows/lib.sh.license
@@ -1,2 +1,2 @@
 SPDX-FileCopyrightText: 2019-2025 Nextcloud GmbH and Nextcloud contributors
-SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/.github/workflows/uploadArtifact.sh b/.github/workflows/uploadArtifact.sh
@@ -3,7 +3,7 @@
 #
 # SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
 # SPDX-FileCopyrightText: 2019-2022 Tobias Kaminsky <tobias@kaminsky.me>
-# SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+# SPDX-License-Identifier: AGPL-3.0-or-later
 #
 
 #1: LOG_USERNAME
diff --git a/LICENSES/GPL-2.0-only.txt b/LICENSES/GPL-2.0-only.txt

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors`
`2`		`-SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only`
	`2`	`+SPDX-License-Identifier: AGPL-3.0-or-later`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`SPDX-FileCopyrightText: 2019-2025 Nextcloud GmbH and Nextcloud contributors`
`2`		`-SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only`
	`2`	`+SPDX-License-Identifier: AGPL-3.0-or-later`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`#`
`4`	`4`	`# SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors`
`5`	`5`	`# SPDX-FileCopyrightText: 2019-2022 Tobias Kaminsky <tobias@kaminsky.me>`
`6`		`-# SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only`
	`6`	`+# SPDX-License-Identifier: AGPL-3.0-or-later`
`7`	`7`	`#`
`8`	`8`
`9`	`9`	`#1: LOG_USERNAME`