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

fix: merge conflicts main -> staging #57

Merged
merged 10 commits into from
Feb 7, 2025
Merged

fix: merge conflicts main -> staging #57

merged 10 commits into from
Feb 7, 2025

Conversation

roerohan
Copy link
Member

@roerohan roerohan commented Feb 7, 2025

Linear Issue
fixes WEB-4175

Description

Fixes merge conflicts between main and staging

Screenshots

ravindra-dyte and others added 10 commits January 10, 2025 15:48
…icipant-tile

fix(dyte-participant-tile): network disconnected icon is not going away due to incorrect field
## [2.1.4](https://github.com/dyte-io/ui-kit/compare/@dyte-in/ui-kit-v2.1.3...@dyte-in/ui-kit-v2.1.4) (2025-01-10)

### Bug Fixes

* **dyte-participant-tile:** network disconnected icon is not going away due to incorrect field ([65eca1c](65eca1c))

skip-checks: true
ci(release): fixed released, using npm ci instead of install, updated utils to match web-core
fix(release): empty commit to fix previous empty no-dist npm release
## [2.1.5](https://github.com/dyte-io/ui-kit/compare/@dyte-in/ui-kit-v2.1.4...@dyte-in/ui-kit-v2.1.5) (2025-01-10)

### Bug Fixes

* **release:** empty commit to fix previous empty no-dist npm release ([0157d66](0157d66))

skip-checks: true
@roerohan roerohan self-assigned this Feb 7, 2025
@roerohan roerohan merged commit c87f490 into staging Feb 7, 2025
5 checks passed
@roerohan roerohan deleted the fix-conflicts branch February 7, 2025 18:53
Copy link

github-actions bot commented Feb 7, 2025

🎉 This PR is included in version 2.2.0-staging.8 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Copy link

github-actions bot commented Feb 7, 2025

🎉 This PR is included in version 2.2.0 🎉

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants