Skip to content

Commit dd0de9c

Browse files
committed
Merge branch 'main' of github.com:hyperpolymath/patallm-gallery
2 parents e93a55d + 59733ea commit dd0de9c

17 files changed

Lines changed: 56 additions & 4 deletions

File tree

.github/FUNDING.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
<<<<<<< HEAD
12
# SPDX-License-Identifier: PMPL-1.0-or-later
3+
=======
4+
# SPDX-License-Identifier: MPL-2.0-or-later
5+
>>>>>>> 1b58383 (chore: sync from parent repo automation)
26
# Funding platforms for hyperpolymath projects
37
# See: https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/displaying-a-sponsor-button-in-your-repository
48

.github/workflows/codeql.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
<<<<<<< HEAD
12
# SPDX-License-Identifier: PMPL-1.0-or-later
3+
=======
4+
# SPDX-License-Identifier: MPL-2.0-or-later
5+
>>>>>>> 1b58383 (chore: sync from parent repo automation)
26
# CodeQL disabled - no scannable source code detected
37
name: CodeQL Security Analysis
48

.github/workflows/instant-sync.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
<<<<<<< HEAD
12
# SPDX-License-Identifier: PMPL-1.0-or-later
3+
=======
4+
# SPDX-License-Identifier: MPL-2.0-or-later
5+
>>>>>>> 1b58383 (chore: sync from parent repo automation)
26
# Instant Forge Sync - Triggers propagation to all forges on push/release
37
name: Instant Sync
48

.github/workflows/mirror.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
<<<<<<< HEAD
12
# SPDX-License-Identifier: PMPL-1.0-or-later
3+
=======
4+
# SPDX-License-Identifier: MPL-2.0-or-later
5+
>>>>>>> 1b58383 (chore: sync from parent repo automation)
26
name: Mirror to GitLab and Bitbucket
37

48
on:

.github/workflows/rsr-antipattern.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
<<<<<<< HEAD
12
# SPDX-License-Identifier: PMPL-1.0-or-later
3+
=======
4+
# SPDX-License-Identifier: MPL-2.0-or-later
5+
>>>>>>> 1b58383 (chore: sync from parent repo automation)
26
name: RSR Language Policy
37

48
on:

.github/workflows/semgrep.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
<<<<<<< HEAD
12
# SPDX-License-Identifier: PMPL-1.0-or-later
3+
=======
4+
# SPDX-License-Identifier: MPL-2.0-or-later
5+
>>>>>>> 1b58383 (chore: sync from parent repo automation)
26
name: Semgrep SAST
37

48
on:

.github/workflows/workflow-linter.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
<<<<<<< HEAD
12
# SPDX-License-Identifier: PMPL-1.0-or-later
3+
=======
4+
# SPDX-License-Identifier: MPL-2.0-or-later
5+
>>>>>>> 1b58383 (chore: sync from parent repo automation)
26
# workflow-linter.yml - Validates GitHub workflows against RSR security standards
37
# This workflow can be copied to other repos for consistent enforcement
48
name: Workflow Security Linter

MAINTAINERS.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
<<<<<<< HEAD
12
// SPDX-License-Identifier: PMPL-1.0-or-later
3+
=======
4+
// SPDX-License-Identifier: MPL-2.0-or-later
5+
>>>>>>> 1b58383 (chore: sync from parent repo automation)
26
= Maintainers
37
:toc: preamble
48

README.adoc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
1+
<<<<<<< HEAD
12
// SPDX-License-Identifier: PMPL-1.0-or-later
3+
=======
4+
// SPDX-License-Identifier: MPL-2.0-or-later
5+
>>>>>>> 1b58383 (chore: sync from parent repo automation)
26
// SPDX-FileCopyrightText: 2025 Hyperpolymath
37

48
= PatALLM Gallery
59

10+
<<<<<<< HEAD
611
image:https://img.shields.io/badge/License-PMPL--1.0-blue.svg[License: PMPL-1.0,link="https://github.com/hyperpolymath/palimpsest-license"]
12+
=======
13+
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"]
14+
>>>>>>> 1b58383 (chore: sync from parent repo automation)
715
:toc: macro
816
:toclevels: 3
917
:icons: font

ROADMAP.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
<<<<<<< HEAD
12
// SPDX-License-Identifier: PMPL-1.0-or-later
3+
=======
4+
// SPDX-License-Identifier: MPL-2.0-or-later
5+
>>>>>>> 1b58383 (chore: sync from parent repo automation)
26
// SPDX-FileCopyrightText: 2025 Hyperpolymath
37

48
= PatALLM Gallery Roadmap

0 commit comments

Comments
 (0)