Skip to content
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

chore(merge): resolve conflicts from main #11101

Conversation

ariellalgilmore
Copy link
Member

Related Ticket(s)

none

Description

resolve conflicts from updated cwc-v2 branch which was update from main

Changelog

New

  • {{new thing}}

Changed

  • {{changed thing}}

Removed

  • {{removed thing}}

@ariellalgilmore ariellalgilmore added package: web components Work necessary for the IBM.com Library web components package v2: prep preparation items for Carbon for IBM.com V2 labels Nov 6, 2023
@ariellalgilmore ariellalgilmore requested a review from a team as a code owner November 6, 2023 20:48
Copy link
Member

@kennylam kennylam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@ariellalgilmore ariellalgilmore merged commit 0c43e41 into carbon-design-system:feat/carbon-for-ibm-dotcom-v2 Nov 6, 2023
3 of 7 checks passed
@ibmdotcom-bot
Copy link
Contributor

@ariellalgilmore ariellalgilmore deleted the chore/merge-conflicts-v2-resolve branch November 6, 2023 21:44
@ibmdotcom-bot
Copy link
Contributor

@ibmdotcom-bot
Copy link
Contributor

kennylam pushed a commit to kennylam/carbon-for-ibm-dotcom that referenced this pull request Jun 11, 2024
…ore/merge-conflicts-v2-resolve

chore(merge): resolve conflicts from main
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
package: web components Work necessary for the IBM.com Library web components package v2: prep preparation items for Carbon for IBM.com V2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants