Skip to content

Fix parse error caused by recent merges#272

Merged
kittenkamala merged 1 commit intomasterfrom
fix/parse-error
Sep 12, 2025
Merged

Fix parse error caused by recent merges#272
kittenkamala merged 1 commit intomasterfrom
fix/parse-error

Conversation

@desrosj
Copy link
Copy Markdown
Member

@desrosj desrosj commented Sep 12, 2025

Fixes #271.

This appears to be the result of a bad merge conflict resolution in #264 (specifically 7f5365d).

@desrosj desrosj self-assigned this Sep 12, 2025
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Sep 12, 2025

The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the props-bot label.

If you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message.

Co-authored-by: desrosj <desrosj@git.wordpress.org>
Co-authored-by: kittenkamala <amykamala@git.wordpress.org>
Co-authored-by: kmott <mywp459@git.wordpress.org>

To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook.

@kittenkamala
Copy link
Copy Markdown
Contributor

Going to merge this right away considering something is broken.

@kittenkamala kittenkamala merged commit 114d49f into master Sep 12, 2025
2 checks passed
@kittenkamala kittenkamala deleted the fix/parse-error branch September 12, 2025 16:30
@kittenkamala
Copy link
Copy Markdown
Contributor

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Parse error in test.php (unclosed braces?)

2 participants