Skip to content

AccountServiceImpl : resolve merge conflicts in Javadoc comments #484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

AccountServiceImpl : resolve merge conflicts in Javadoc comments #484

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions dspace-api/src/main/java/org/dspace/eperson/AccountServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,9 @@ protected AccountServiceImpl() {
*
* @param context DSpace context
* @param email Email address to send the registration email to
<<<<<<< HEAD
* @throws java.sql.SQLException passed through.
* @throws java.io.IOException passed through.
* @throws javax.mail.MessagingException passed through.
=======
* @throws java.sql.SQLException passed through.
* @throws java.io.IOException passed through.
* @throws jakarta.mail.MessagingException passed through.
>>>>>>> dspace-8.0
* @throws org.dspace.authorize.AuthorizeException passed through.
*/
@Override
Expand Down Expand Up @@ -138,15 +132,9 @@ public void sendRegistrationInfo(Context context, String email, List<UUID> group
*
* @param context DSpace context
* @param email Email address to send the forgot-password email to
<<<<<<< HEAD
* @throws java.sql.SQLException passed through.
* @throws java.io.IOException passed through.
* @throws javax.mail.MessagingException passed through.
=======
* @throws java.sql.SQLException passed through.
* @throws java.io.IOException passed through.
* @throws jakarta.mail.MessagingException passed through.
>>>>>>> dspace-8.0
* @throws org.dspace.authorize.AuthorizeException passed through.
*/
@Override
Expand Down
Loading