From f9a37b4e7f1c2cc4b980d937a73a42686392b0cc Mon Sep 17 00:00:00 2001 From: arshiya2290 <162872925+arshiya2290@users.noreply.github.com> Date: Mon, 18 Mar 2024 22:14:17 +0530 Subject: [PATCH] Update file1 add file --- file1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file1 b/file1 index 9aece9b..11ce6cf 100644 --- a/file1 +++ b/file1 @@ -1,5 +1,5 @@ Resolve merge conflict - +hi sunil Hello Goodmorning!! Have a great day feature1