Fix merge conflict resolution errors

guangyee · Dec 10, 2020 · 21d24cd · 21d24cd
1 parent 7cc973e
commit 21d24cd
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/sle12/profiles/stig.profile b/sle12/profiles/stig.profile
@@ -20,12 +20,12 @@ selections:
     - no_user_host_based_files
     - auditd_data_disk_full_action
     - postfix_client_configure_mail_alias
-    - accounts_logon_fail_delay 
+    - accounts_logon_fail_delay
     - no_host_based_files
     - banner_etc_motd
     - accounts_no_uid_except_zero
-    - no_user_host_based_files
-    - no_user_host_based_files
     - package_audit_installed
     - service_auditd_enabled
     - auditd_data_retention_space_left
+    - auditd_data_retention_action_mail_acct
+