Removes duplicate bean definition in ResourceControllerIntegrationTests#2286
Merged
ryanjbaxter merged 1 commit intospring-cloud:mainfrom Jun 14, 2023
Merged
Removes duplicate bean definition in ResourceControllerIntegrationTests#2286ryanjbaxter merged 1 commit intospring-cloud:mainfrom
ryanjbaxter merged 1 commit intospring-cloud:mainfrom
Conversation
Contributor
Author
|
@ryanjbaxter above commit is included in #2287 as well. feel free to close this one, if the other one merged |
Contributor
|
Thanks I merged this forward and went to bed, obviously that wasnt the best idea 🤦♂️ |
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
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.
This might have happened during merge.
ResourceControllerAdvicebean was already defined in the same test class.