Skip to content

Feature/fix text - merge conflict fixes#44

Open
tomato-7 wants to merge 24 commits intoexplosion:feature/fix-textfrom
amdgs:feature/fix-text
Open

Feature/fix text - merge conflict fixes#44
tomato-7 wants to merge 24 commits intoexplosion:feature/fix-textfrom
amdgs:feature/fix-text

Conversation

@tomato-7
Copy link

Just fixed the trivial merge conflicts in this feature branch.

We are looking to use this feature, so it would be appreciated to get the feature branch merged into main.

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.

6 participants

Comments