From a63a07cf3e08aa793159a07be98bb51fd9f600d2 Mon Sep 17 00:00:00 2001
From: Allen Golbig <allen.golbig@jamf.com>
Date: Wed, 19 Jan 2022 20:34:00 -0500
Subject: [PATCH] fixed rule

---
 rules/os/os_guest_folder_removed.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/rules/os/os_guest_folder_removed.yaml b/rules/os/os_guest_folder_removed.yaml
index b6cb4f78..4cd6eac8 100644
--- a/rules/os/os_guest_folder_removed.yaml
+++ b/rules/os/os_guest_folder_removed.yaml
@@ -1,10 +1,6 @@
 id: os_guest_folder_removed
 title: "Remove Guest Folder if Present"
-<<<<<<< HEAD
-discussion:   
-=======
 discussion: |  
->>>>>>> 7937b70b142c54723d7c635c387a4efd46b526da
   The guest folder _MUST_ be deleted if present.
 check: |
   /bin/ls /Users/ | /usr/bin/grep -c "Guest"