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 conflict errors, tweak UI #193

Merged
merged 1 commit into from
Aug 22, 2023

Conversation

e-halinen
Copy link
Collaborator

  • Fixed some errors that were caused by big merge conflict fixes
  • delete unused functions
  • Tweak UI

Copy link
Contributor

@hsl-petrhaj hsl-petrhaj left a comment

Choose a reason for hiding this comment

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

This works.

@e-halinen e-halinen merged commit 9651891 into master Aug 22, 2023
2 checks passed
@e-halinen e-halinen deleted the merge_conflict_tweaks_resolutions branch August 22, 2023 13:34
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.

2 participants