Conversation
…-1692 # Conflicts: # src/main/java/org/breedinginsight/api/v1/controller/ProgramController.java # src/main/java/org/breedinginsight/api/v1/controller/UserController.java
To ensure this changelist matches previous BI-1692 changelist
mlm483
approved these changes
Aug 12, 2024
nickpalladino
approved these changes
Aug 12, 2024
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Description
Re-merging changes from BI-1692 due to github oddly dropping the changes from the develop branch. More details in old PR.
Dependencies
Please include any dependencies to other code branches, testing configurations, scripts to be run, etc.
Testing
Please include any details needed for reviewers to test this code
Checklist: