fix(ras-acc): cleanup merge conflict markup #2335
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
chickenn00dle
added
the
[Status] Needs Review
chickenn00dle
force-pushed
the
fix/merge-conflict-markup
branch
from
0517f35 to
6f84662
Compare
github-actions
bot
added
[Status] Approved
matticbot
pushed a commit
that referenced
this pull request
Jul 8, 2024
# [1.91.0-epic-ras-acc.2](v1.91.0-epic-ras-acc.1...v1.91.0-epic-ras-acc.2) (2024-07-08) ### Bug Fixes * **ras-acc:** clean up merge conflict marker ([#2335](#2335)) ([080e0fc](080e0fc))
|
🎉 This PR is included in version 1.91.0-epic-ras-acc.2 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
matticbot
pushed a commit
that referenced
this pull request
Jul 17, 2024
# [1.92.0-epic-ras-acc.1](v1.91.0...v1.92.0-epic-ras-acc.1) (2024-07-17) ### Bug Fixes * **ras-acc:** clean up merge conflict marker ([#2335](#2335)) ([080e0fc](080e0fc)) ### Features * add newspack-block-theme backwards compatibility ([#2315](#2315)) ([0e60c3a](0e60c3a)) * update clamp calculations based on viewport range of 782 - 1280 ([63307ae](63307ae)) * update Newspack UI variable font sizes for the theme ([212e2fd](212e2fd))
|
🎉 This PR is included in version 1.92.0-epic-ras-acc.1 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
matticbot
pushed a commit
that referenced
this pull request
Jul 31, 2024
# [1.93.0-epic-ras-acc.1](v1.92.0...v1.93.0-epic-ras-acc.1) (2024-07-31) ### Bug Fixes * **ras-acc:** clean up merge conflict marker ([#2335](#2335)) ([080e0fc](080e0fc)) * **ras-acc:** remove redundant checkout styles ([#2350](#2350)) ([1f48f20](1f48f20)) ### Features * update clamp calculations based on viewport range of 782 - 1280 ([63307ae](63307ae)) * update Newspack UI variable font sizes for the theme ([212e2fd](212e2fd))
|
🎉 This PR is included in version 1.93.0-epic-ras-acc.1 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
matticbot
pushed a commit
that referenced
this pull request
Aug 14, 2024
# [2.1.0-epic-ras-acc.1](v2.0.0...v2.1.0-epic-ras-acc.1) (2024-08-14) ### Bug Fixes * correct linting errors ([d3b74c7](d3b74c7)) * correct more linting errors ([593c246](593c246)) * **ras-acc:** clean up merge conflict marker ([#2335](#2335)) ([080e0fc](080e0fc)) * **ras-acc:** remove redundant checkout styles ([#2350](#2350)) ([1f48f20](1f48f20)) ### Features * update clamp calculations based on viewport range of 782 - 1280 ([63307ae](63307ae)) * update Newspack UI variable font sizes for the theme ([212e2fd](212e2fd))
|
🎉 This PR is included in version 2.1.0-epic-ras-acc.1 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
matticbot
pushed a commit
that referenced
this pull request
Nov 12, 2024
# [2.3.0-epic-ras-acc.1](v2.2.0...v2.3.0-epic-ras-acc.1) (2024-11-12) ### Bug Fixes * correct linting errors ([d3b74c7](d3b74c7)) * correct more linting errors ([593c246](593c246)) * **ras-acc:** clean up merge conflict marker ([#2335](#2335)) ([080e0fc](080e0fc)) * **ras-acc:** remove redundant checkout styles ([#2350](#2350)) ([1f48f20](1f48f20)) ### Features * update clamp calculations based on viewport range of 782 - 1280 ([63307ae](63307ae)) * update Newspack UI variable font sizes for the theme ([212e2fd](212e2fd))
|
🎉 This PR is included in version 2.3.0-epic-ras-acc.1 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
matticbot
pushed a commit
that referenced
this pull request
Nov 26, 2024
# [2.4.0-epic-ras-acc.1](v2.3.0...v2.4.0-epic-ras-acc.1) (2024-11-26) ### Bug Fixes * correct linting errors ([d3b74c7](d3b74c7)) * correct more linting errors ([593c246](593c246)) * **ras-acc:** clean up merge conflict marker ([#2335](#2335)) ([080e0fc](080e0fc)) * **ras-acc:** remove redundant checkout styles ([#2350](#2350)) ([1f48f20](1f48f20)) ### Features * update clamp calculations based on viewport range of 782 - 1280 ([63307ae](63307ae)) * update Newspack UI variable font sizes for the theme ([212e2fd](212e2fd))
|
🎉 This PR is included in version 2.4.0-epic-ras-acc.1 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
All Submissions:
Changes proposed in this Pull Request:
Left some merge conflict markup while merging trunk 🙇
This PR cleans it up!
How to test the changes in this Pull Request:
Other information: