fix: don't fail checking appointments for new participants #158
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
given I just merged master into develop, and that I already touched this in https://github.com/UiL-OTS-labs/ppn-backend/pull/152/files#diff-02fc974c2cd1c086fb084d6d1688a7ddc697f839a2fdfa2dcbed49c21a9f6e7eR434 I don't get why this is not conflicting now? |
|
It's not conflicting because I added code nowhere near where you changed that. Not sure if git is smart enough to merge that, or if github is. After some more time with GitLab I'm starting to suspect the latter |
|
But, as this is redundant, do we want to close this; or do we want to remove your fix and replace it with this one? (In that case, I'll merge develop into this branch to do so as part of this PR) |
tymees
force-pushed
the
fix/new-participants-signup-errors
branch
from
6106c30 to
648790c
Compare
bbonf
approved these changes
Sep 27, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #157