From 8bbc370694bfe553c25e3930a9949569cfac0366 Mon Sep 17 00:00:00 2001 From: Bob Gendler Date: Thu, 10 Feb 2022 12:09:21 -0500 Subject: [PATCH] fixed merge conflict --- .../sysprefs_screensaver_ask_for_password_delay_enforce.yaml | 3 --- rules/sysprefs/sysprefs_system_wide_preferences_configure.yaml | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/sysprefs/sysprefs_screensaver_ask_for_password_delay_enforce.yaml b/rules/sysprefs/sysprefs_screensaver_ask_for_password_delay_enforce.yaml index be342002..8fa8a1a4 100644 --- a/rules/sysprefs/sysprefs_screensaver_ask_for_password_delay_enforce.yaml +++ b/rules/sysprefs/sysprefs_screensaver_ask_for_password_delay_enforce.yaml @@ -42,13 +42,10 @@ tags: - 800-53r4_high - 800-171 - cnssi-1253 -<<<<<<< HEAD - cis_lvl1 - cis_lvl2 - cisv8 -======= - stig ->>>>>>> dev_mont_stig severity: "medium" mobileconfig: true mobileconfig_info: diff --git a/rules/sysprefs/sysprefs_system_wide_preferences_configure.yaml b/rules/sysprefs/sysprefs_system_wide_preferences_configure.yaml index 4a10f29a..87d2e1b1 100644 --- a/rules/sysprefs/sysprefs_system_wide_preferences_configure.yaml +++ b/rules/sysprefs/sysprefs_system_wide_preferences_configure.yaml @@ -45,6 +45,9 @@ tags: - 800-53r4_high - 800-171 - cnssi-1253 + - cis_lvl1 + - cis_lvl2 + - cisv8 - stig severity: "medium" mobileconfig: false