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

Test version 1 #50

Merged
merged 8 commits into from
Sep 3, 2024
Merged

Test version 1 #50

merged 8 commits into from
Sep 3, 2024

Conversation

ahocevar
Copy link
Contributor

@ahocevar ahocevar commented Sep 3, 2024

No description provided.

@ahocevar
Copy link
Contributor Author

ahocevar commented Sep 3, 2024

Rebase auf main gemacht, Konflikte in useLookUps.js behoben, pointermove Cursor Logik in useSchlag.js angepasst.

@ahocevar ahocevar merged commit ae6de9d into main Sep 3, 2024
1 check passed
@ahocevar
Copy link
Contributor Author

ahocevar commented Sep 3, 2024

@arnold-pichler Ich habe das jetzt gemergt und fange für das Speichern/Anzeigen des Schlages einen neuen Feature Branch an.

@ahocevar ahocevar deleted the test-version-1 branch September 3, 2024 16:20
ahocevar added a commit that referenced this pull request Sep 3, 2024
ahocevar added a commit that referenced this pull request Sep 3, 2024
Recover from conflict resolution in #50
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