-
Notifications
You must be signed in to change notification settings - Fork 2
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.
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
Merge beta + main conflict resolutions into beta #122
Conversation
|
323c5db
to
c8de0bf
Compare
This repo was/is having the same problem as the auro-flight repo where rollup fails to run on linux x64. This should fix the build as the same change worked on auro-flight.
Reviewer's Guide by SourceryThis pull request resolves conflicts between the beta and main branches of the Alaska Airlines Accordion component. The changes primarily involve minor updates to the README.md file and the CHANGELOG.md file. The main changes include:
The changes appear to be mostly housekeeping in nature, preparing the beta branch for merging into the main branch. File-Level Changes
Tips
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hey @DukeFerdinand - I've reviewed your changes and they look great!
Here's what I looked at during the review
- 🟢 General issues: all looks good
- 🟢 Security: all looks good
- 🟢 Testing: all looks good
- 🟢 Complexity: all looks good
- 🟢 Documentation: all looks good
Help me be more useful! Please click 👍 or 👎 on each comment to tell me if it was helpful.
BREAKING CHANGE: trigger major release for color theme support #115
🎉 This PR is included in version 4.0.0-beta.1 🎉 The release is available on: Your semantic-release bot 📦🚀 |
Alaska Airlines Pull Request
Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
Resolves: #115
Summary:
Beta and main have slightly diverged since opening the beta branch. This PR intends to resolve those for a simple merge into main once we're ready to ship the theme beta :)
Type of change:
Please delete options that are not relevant.
Checklist:
By submitting this Pull Request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
Pull Requests will be evaluated by their quality of update and whether it is consistent with the goals and values of this project. Any submission is to be considered a conversation between the submitter and the maintainers of this project and may require changes to your submission.
Thank you for your submission!
-- Auro Design System Team
Summary by Sourcery
Merge changes from the main branch into the beta branch, resolving conflicts and updating documentation formatting. Revert a previous feature related to theme support in the CHANGELOG.
Documentation:
Chores: