Skip to content

fix(ci): resolve leftover merge-conflict markers in 3 files #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hyperpolymath merged 1 commit into from
Jul 4, 2026
Merged

fix(ci): resolve leftover merge-conflict markers in 3 files #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/FUNDING.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
<<<<<<< HEAD
# SPDX-License-Identifier: MPL-2.0
=======
# SPDX-License-Identifier: MPL-2.0
>>>>>>> 1b58383 (chore: sync from parent repo automation)
# Funding platforms for hyperpolymath projects
# See: https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/displaying-a-sponsor-button-in-your-repository

Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/instant-sync.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
<<<<<<< HEAD
# SPDX-License-Identifier: MPL-2.0
=======
# SPDX-License-Identifier: MPL-2.0
>>>>>>> 1b58383 (chore: sync from parent repo automation)
# Instant Forge Sync - Triggers propagation to all forges on push/release
name: Instant Sync

Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/semgrep.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
<<<<<<< HEAD
# SPDX-License-Identifier: MPL-2.0
=======
# SPDX-License-Identifier: MPL-2.0
>>>>>>> 1b58383 (chore: sync from parent repo automation)
name: Semgrep SAST

on:
Expand Down
Loading