From e832619610da66e7b6e544d5e1ee0372395cef71 Mon Sep 17 00:00:00 2001
From: jeet041 <mahorjitendra@gmail.com>
Date: Thu, 17 Apr 2025 17:44:48 +0530
Subject: [PATCH] Update AI_to_merge_conflict.yml

Signed-off-by: jeet041 <mahorjitendra@gmail.com>
---
 .github/workflows/AI_to_merge_conflict.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/AI_to_merge_conflict.yml b/.github/workflows/AI_to_merge_conflict.yml
index f3f1c92cf..e65e96216 100644
--- a/.github/workflows/AI_to_merge_conflict.yml
+++ b/.github/workflows/AI_to_merge_conflict.yml
@@ -59,7 +59,7 @@ jobs:
               \"owner\": \"${{ github.repository_owner }}\",
               \"repo_name\": \"${{ github.event.repository.name }}\",
               \"file_path\": \"$file\",
-              # \"conflict_content\": $(jq -Rs <<< \"$conflict_content\"),
+              \"conflict_content\": $(jq -Rs <<< \"$conflict_content\"),
               \"pr_number\": \"${{ github.event.pull_request.number }}\",
             }
             EOF