chore: resolve merge conflicts

Author: hyperpolymath

MAINTAINERS.adoc

@@ -1,8 +1,5 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright (c) Jonathan D.A. Jewell <j.d.a.jewell@open.ac.uk>
-<<<<<<< HEAD
-=======
->>>>>>> 1b58383 (chore: sync from parent repo automation)
 = Maintainers
 :toc: preamble
 

README.adoc

@@ -1,19 +1,12 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright (c) Jonathan D.A. Jewell <j.d.a.jewell@open.ac.uk>
-<<<<<<< HEAD
-=======
 image:https://img.shields.io/badge/OpenSSF-Best_Practices-green?logo=openssourcesecurity[OpenSSF Best Practices,link="https://www.bestpractices.dev/en/projects/new?repo_url=https://github.com/hyperpolymath/patallm-gallery"]
 
->>>>>>> 1b58383 (chore: sync from parent repo automation)
 // SPDX-FileCopyrightText: 2025 Hyperpolymath
 
 = PatALLM Gallery
 
-<<<<<<< HEAD
-image:https://img.shields.io/badge/License-MPL_2.0-blue.svg[License: MPL-2.0,link="https://opensource.org/licenses/MPL-2.0"]
-=======
 image:https://img.shields.io/badge/License-MPL_2.0-blue.svg[MPL-2.0-or-later,link="https://opensource.org/licenses/MPL-2.0"]
->>>>>>> 1b58383 (chore: sync from parent repo automation)
 :toc: macro
 :toclevels: 3
 :icons: font

ROADMAP.adoc

@@ -1,8 +1,5 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright (c) Jonathan D.A. Jewell <j.d.a.jewell@open.ac.uk>
-<<<<<<< HEAD
-=======
->>>>>>> 1b58383 (chore: sync from parent repo automation)
 // SPDX-FileCopyrightText: 2025 Hyperpolymath
 
 = PatALLM Gallery Roadmap

claude-integrations/gecko-browser-extension/CONTRIBUTING.adoc

@@ -1,8 +1,5 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright (c) Jonathan D.A. Jewell <j.d.a.jewell@open.ac.uk>
-<<<<<<< HEAD:claude-integrations/gecko-browser-extension/CONTRIBUTING.adoc
-=======
->>>>>>> 1b58383 (chore: sync from parent repo automation):CONTRIBUTING.adoc
 = Contributing Guide
 
 == Getting Started