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): conflict from cwc-2.1.0 #11237

Conversation

ariellalgilmore
Copy link
Member

Related Ticket(s)

Closes # {{Provide issue number link(s) to the related ticket(s) that this pull request addresses}}

Description

{{Add a human-readable description / detail summary of what the PR is changing and any details around how and why}}

{{If applicable, include a screenshot indicating an example or examples of what the PR is changing in the application}}

Changelog

New

  • {{new thing}}

Changed

  • {{changed thing}}

Removed

  • {{removed thing}}

@ariellalgilmore ariellalgilmore requested a review from a team as a code owner December 15, 2023 17:48
@ariellalgilmore ariellalgilmore requested review from kennylam and sangeethababu9223 and removed request for a team December 15, 2023 17:48
@ariellalgilmore ariellalgilmore changed the title chore(merge): conflict chore(merge): conflict from cwc-2.1.0 Dec 15, 2023
@ibmdotcom-bot
Copy link
Contributor

ibmdotcom-bot commented Dec 15, 2023

@ibmdotcom-bot
Copy link
Contributor

ibmdotcom-bot commented Dec 15, 2023

@ariellalgilmore ariellalgilmore added the Ready to merge Label for the pull requests that are ready to merge label Dec 15, 2023
@ibmdotcom-bot
Copy link
Contributor

ibmdotcom-bot commented Dec 15, 2023

@kodiakhq kodiakhq bot merged commit 6f5a1b1 into carbon-design-system:main Dec 15, 2023
11 of 20 checks passed
@ariellalgilmore ariellalgilmore deleted the chore/release-2.1.0-merge-conflict branch December 15, 2023 22:44
kennylam pushed a commit to kennylam/carbon-for-ibm-dotcom that referenced this pull request Jun 11, 2024
### Related Ticket(s)

Closes # {{Provide issue number link(s) to the related ticket(s) that this pull request addresses}}

### Description

{{Add a human-readable description / detail summary of what the PR is changing and any details around how and why}}

{{If applicable, include a screenshot indicating an example or examples of what the PR is changing in the application}}

### Changelog

**New**

- {{new thing}}

**Changed**

- {{changed thing}}

**Removed**

- {{removed thing}}

<!-- React and Web Component deploy previews are enabled by default. -->
<!-- To enable additional available deploy previews, apply the following -->
<!-- labels for the corresponding package: -->
<!-- *** "test: e2e": Codesandbox examples and e2e integration tests -->
<!-- *** "package: services": Services -->
<!-- *** "package: utilities": Utilities -->
<!-- *** "RTL": React / Web Components (RTL) -->
<!-- *** "feature flag": React / Web Components (experimental) -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Ready to merge Label for the pull requests that are ready to merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants