resolved merge conflicts

alaka-defaults.yml

@@ -8,18 +8,25 @@ GLOBALS:
   basic_auth_hash: your_super_secret_password
 authentik:
   env:
+    GROUP_HELP: "Hilfe"
     EXTRA_DOMAINS: ", `example.com`"
     REDIRECTS: "example.com"
     DEFAULT_LANGUAGE: de
     AUTHENTIK_DISABLE_UPDATE_CHECK: true
     APPLICATIONS:
-      #Calendar: https://nextcloud.example.com/apps/calendar/
-      #BBB: https://nextcloud.example.com/apps/bbb
-      Hilfe: https://wiki.local-it.org/s/kollicloud-wiki/
+      #Calendar: 
+        #url: https://nextcloud.example.com/apps/calendar/
+        #group: ""
+      #BBB: 
+        #url: https://nextcloud.example.com/apps/bbb
+        #group: ""
+      KolliCloud-Anleitung:
+        url: https://wiki.local-it.org/s/kollicloud-wiki/
+        group: "$GROUP_HELP"
     EXTRA_ICONS:
       #Calendar: ~/.abra/recipes/authentik/icons/calendar.svg
       #BBB: ~/.abra/recipes/authentik/icons/bbb.png
-      Hilfe: ~/.abra/recipes/authentik/icons/help.svg
+      KolliCloud-Anleitung: ~/.abra/recipes/authentik/icons/help.svg
   uncomment:
     - compose.css.yml
   comment: