From 561a8af8a53bad7f7cfa649fd36a3da51d75767d Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Tue, 19 Nov 2024 20:46:40 +0530
Subject: [PATCH] fix(CI): Removed Git Merge Conflict marker check from linter

Signed-off-by: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
---
 .github/workflows/linter.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index 91cac600..7843e349 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -46,6 +46,7 @@ jobs:
           VALIDATE_YAML: false
           VALIDATE_CHECKOV: false
           VALIDATE_SHELL_SHFMT: false
+          VALIDATE_GIT_MERGE_CONFLICT_MARKERS: false
       - name: Set read and write permission in super linter log
         run: sudo chmod 777 super-linter.log
       - name: Upload Lint Result