Fix merge conflicts

Eric-Domeier · Eric-Domeier · commit ade5bdfe30b7 · 2026-02-08T21:16:45.000-05:00
diff --git a/linux_os/guide/system/accounts/accounts-physical/logind_session_timeout/rule.yml b/linux_os/guide/system/accounts/accounts-physical/logind_session_timeout/rule.yml
@@ -21,6 +21,7 @@ platforms:
     - os_linux[rhel]>=8.7 and os_linux[rhel]!=9.0
     - os_linux[ol]>=8.7
     - os_linux[sles]>=15
+    - os_linux[amzn]==2023
 
 identifiers:
     cce@rhel8: CCE-90784-0
diff --git a/shared/applicability/os_linux.yml b/shared/applicability/os_linux.yml
@@ -20,7 +20,7 @@ args:
         os_name: "SUSE Linux Enterprise Server"
         os_id: 'sles'
         os_id_ansible: "SLES"
-    al:
+    amzn:
         os_name: "Amazon Linux"
         os_id: "amzn"
         os_id_ansible: "Amazon"
