From 9233b3c146c20a16fb5853be452567acf8aa5690 Mon Sep 17 00:00:00 2001 From: 1023prachu Date: Fri, 14 Jun 2024 16:21:59 +0530 Subject: [PATCH] create merge conflict to hotfix2 --- script1.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/script1.sh b/script1.sh index daf319a8..bf320269 100644 --- a/script1.sh +++ b/script1.sh @@ -4,7 +4,7 @@ echo "Happy weekend" echo "ssss" echo "hkj" echo "uh;ob" -echo "move to matheran" -echo "no move to lonavala" -echo "Hi this hotfix1 file" -echo "this scrpit 1" \ No newline at end of file +echo "move to Mahabaleshwar" +echo "no move to goa" +echo "Hi this hotfix2 file" +echo "this scrpit-first" \ No newline at end of file