AccountServiceImpl : resolve merge conflicts in Javadoc comments#484
Closed
saschaszott wants to merge 1 commit into4Science:main-crisfrom
Closed
AccountServiceImpl : resolve merge conflicts in Javadoc comments#484saschaszott wants to merge 1 commit into4Science:main-crisfrom
saschaszott wants to merge 1 commit into4Science:main-crisfrom
Conversation
Author
|
@jor4science, this is not production-critical but easy to merge. |
Author
|
changes were moved into PR #465 |
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
1 participant
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
This PR resolves two merge conflicts in Javadoc comments.