Skip to content

Commit d8afd78

Browse files
author
odafna
committed
fix: checkstyle and typo
1 parent 6a94282 commit d8afd78

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

docs/MANAGED.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ groups will be deleted. If you define `groups` but set an empty array, keycloak
2020

2121
## Supported full managed resources
2222

23+
<<<<<<< HEAD
2324
<<<<<<< HEAD
2425
| Type | Additional Information | Resource Name |
2526
|---------------------------------|-------------------------------------------------------------------------------------------------|----------------------------------|

src/main/java/de/adorsys/keycloak/config/service/RoleImportService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
import org.springframework.beans.factory.annotation.Autowired;
3737
import org.springframework.stereotype.Service;
3838

39+
import java.util.HashMap;
3940
import java.util.List;
4041
import java.util.Map;
41-
import java.util.HashMap;
4242
import java.util.Objects;
4343
import java.util.Set;
4444
import java.util.function.Consumer;

0 commit comments

Comments
 (0)