fixed merge conflicts #38

Merged

Donat merged 2 commits from merge_branch into main 2025-09-26 17:02:11 +02:00

Conversation 0 Commits 2 Files Changed 17

+5 -592

Donat commented 2025-09-26 17:00:32 +02:00

Owner

Copy Link

Copy Source

No description provided.

Donat added 1 commit 2025-09-26 17:00:32 +02:00

fixed merge conflicts 8f6634b03f

Donat added 1 commit 2025-09-26 17:01:52 +02:00

fixed merge conflicts 8980d98394

Donat merged commit e392ade3f8 into main 2025-09-26 17:02:11 +02:00

Donat deleted branch merge_branch 2025-09-26 17:02:11 +02:00

Donat referenced this issue from a commit 2025-09-26 17:02:13 +02:00

Merge pull request 'fixed merge conflicts' (#38) from merge_branch into main

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

No items

No labels

Milestone

No items

No Milestone

Projects

Clear projects

No projects

Assignees

Clear assignees

Attila Barni Buus mategergely33 Walke zsola03 Donat

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: Donat/SerpentRace#38