fix: resolve merge conflict with release #1199
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
miguelpeixe
approved these changes
Jul 5, 2022
matticbot
pushed a commit
that referenced
this pull request
Jul 14, 2022
# [1.54.0-alpha.1](v1.53.1...v1.54.0-alpha.1) (2022-07-14) ### Bug Fixes * resolve merge conflict with release ([#1199](#1199)) ([ce82826](ce82826)) ### Features * **donate-block:** amounts and frequencies customisation ([#1191](#1191)) ([99d967f](99d967f)) * homepage posts patterns with ad unit ([#1170](#1170)) ([a2e652e](a2e652e)) * support new sponsor options to show authors and categories ([#1156](#1156)) ([67e8834](67e8834))
|
🎉 This PR is included in version 1.54.0-alpha.1 🎉 The release is available on: Your semantic-release bot 📦🚀 |
matticbot
pushed a commit
that referenced
this pull request
Jul 26, 2022
# [1.54.0](v1.53.1...v1.54.0) (2022-07-26) ### Bug Fixes * resolve merge conflict with release ([#1199](#1199)) ([ce82826](ce82826)) ### Features * **donate-block:** amounts and frequencies customisation ([#1191](#1191)) ([99d967f](99d967f)) * homepage posts patterns with ad unit ([#1170](#1170)) ([a2e652e](a2e652e)) * support new sponsor options to show authors and categories ([#1156](#1156)) ([67e8834](67e8834))
|
🎉 This PR is included in version 1.54.0 🎉 The release is available on: 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:
The post-release job after the latest hotfix release is experiencing failures due to a merge conflict. This should fix the conflict.
How to test the changes in this Pull Request:
Verify that
npm ci --legacy-peer-deps && npm run buildrun successfully, and that all CI jobs succeed below. 👇Other information: