Add keycloak plugin 1.4

Author: GitHub Actions

artifacts/rhdh-plugins-reference/keycloak/keycloak-plugin-admin.adoc

@@ -6,14 +6,11 @@ The Keycloak backend plugin, which integrates Keycloak into {product-short}, has
 * Synchronization of Keycloak users in a realm.
 * Synchronization of Keycloak groups and their users in a realm.
 
-<<<<<<< HEAD
-=======
 [NOTE]
 ====
 The supported Keycloak version is `{keycloak-version}`.
 ====
 
->>>>>>> 0babf6a8e (Add keycloak plugin 1.4 (#787))
 == Installation
 
 The Keycloak plugin is pre-loaded in {product-short} with basic configuration properties. To enable it, set the `disabled` property to `false` as follows: