From 3d278f9ebd7127fe36ec38a4a83b8ec39fed1994 Mon Sep 17 00:00:00 2001
From: Toni de la Fuente <toni.delafuente@alfresco.com>
Date: Mon, 30 Apr 2018 12:24:10 -0400
Subject: [PATCH] fixed check28 issue #209

---
 checks/check28 | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/checks/check28 b/checks/check28
index f2e10eb8..bec0e234 100644
--- a/checks/check28
+++ b/checks/check28
@@ -11,10 +11,7 @@
 CHECK_ID_check28="2.8,2.08"
 CHECK_TITLE_check28="[check28] Ensure rotation for customer created CMKs is enabled (Scored)"
 CHECK_SCORED_check28="SCORED"
-<<<<<<< HEAD
-=======
 CHECK_TYPE_check28="LEVEL2"
->>>>>>> 3a6cc73319189063d51ffa9a4e25e28f1d55d668
 CHECK_ALTERNATE_check208="check28"
 
 check28(){