From 575750d548df9b060750d267b9a3f16a40a572a8 Mon Sep 17 00:00:00 2001
From: 1023prachu <prachitayade111@gmail.com>
Date: Fri, 14 Jun 2024 16:19:03 +0530
Subject: [PATCH]  create merge conflict to hotfix1

---
 script1.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/script1.sh b/script1.sh
index 030b3137..daf319a8 100644
--- a/script1.sh
+++ b/script1.sh
@@ -4,5 +4,7 @@ echo "Happy weekend"
 echo "ssss"
 echo "hkj"
 echo "uh;ob"
-echo "jhkj;gytdk"
-echo "jblbl"
+echo "move to matheran"
+echo "no move to lonavala"
+echo "Hi this hotfix1 file"
+echo "this scrpit 1"
\ No newline at end of file