fix: checkstyle and typo

adorsys · Jul 4, 2024 · bfe83ac · bfe83ac
1 parent 6a94282
commit bfe83ac
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/docs/MANAGED.md b/docs/MANAGED.md
@@ -20,7 +20,6 @@ groups will be deleted. If you define `groups` but set an empty array, keycloak
 
 ## Supported full managed resources
 
-<<<<<<< HEAD
 | Type                            | Additional Information                                                                          | Resource Name                    |
 |---------------------------------|-------------------------------------------------------------------------------------------------|----------------------------------|
 | Groups                          | -                                                                                               | `group`                          |

diff --git a/src/main/java/de/adorsys/keycloak/config/service/RoleImportService.java b/src/main/java/de/adorsys/keycloak/config/service/RoleImportService.java
@@ -36,9 +36,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.HashMap;
 import java.util.Objects;
 import java.util.Set;
 import java.util.function.Consumer;