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.

Sign up for GitHub

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

Jump to bottom

fix conflict solution #849

Merged
merged 1 commit into from
Apr 24, 2022
Merged

fix conflict solution #849

merged 1 commit into from
Apr 24, 2022

Conversation

korelstar
Copy link
Member

No description provided.

@korelstar korelstar added bug Something isn't working feature: editor Related to generic parts of the editor, e.g. loading/saving notes labels Apr 24, 2022
@korelstar korelstar added this to the 4.4.0 milestone Apr 24, 2022
@korelstar korelstar merged commit ddd3b1d into master Apr 24, 2022
@korelstar korelstar deleted the conflict branch April 24, 2022 11:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
bug Something isn't working feature: editor Related to generic parts of the editor, e.g. loading/saving notes
Projects
None yet
Milestone
4.4.0
Development

Successfully merging this pull request may close these issues.
1 participant
@korelstar