Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
uphrh-smf-user
Commits
f178087f
Commit
f178087f
authored
2 years ago
by
sarojsingh2021
Browse files
Options
Download
Plain Diff
resolve merge conflict
parents
35128dae
5b8d61f8
master
delete-user
delete-user-fix
institute-district
1 merge request
!3
Delete user
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/main/java/com/tarento/retail/config/JwtTokenUtil.java
+1
-1
src/main/java/com/tarento/retail/config/JwtTokenUtil.java
src/main/java/com/tarento/retail/service/impl/UserServiceImpl.java
+1
-3
...java/com/tarento/retail/service/impl/UserServiceImpl.java
src/main/resources/application.properties
+2
-3
src/main/resources/application.properties
src/main/resources/otp_template.vm
+2
-2
src/main/resources/otp_template.vm
with
6 additions
and
9 deletions
+6
-9
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets