Skip to content

fix/merge conflicts release 1.2.0#697

Merged
ArshaanNazir merged 22 commits intorelease/1.2.0from
fix/merge-conflicts-release-1.2.0
Aug 3, 2023
Merged

fix/merge conflicts release 1.2.0#697
ArshaanNazir merged 22 commits intorelease/1.2.0from
fix/merge-conflicts-release-1.2.0

Conversation

@JulesBelveze
Copy link
Copy Markdown
Contributor

Description

Fix merge conflicts between release/1.2.0 and main

Copy link
Copy Markdown
Contributor

@ArshaanNazir ArshaanNazir left a comment

Choose a reason for hiding this comment

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

Thanks a lot mate

@ArshaanNazir ArshaanNazir merged commit 687f23c into release/1.2.0 Aug 3, 2023
@JulesBelveze JulesBelveze deleted the fix/merge-conflicts-release-1.2.0 branch August 3, 2023 10:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants