From e90a69b9a444100d78471caa66289ca8e7a415ee Mon Sep 17 00:00:00 2001 From: Rohit Date: Sun, 9 Nov 2025 14:48:19 +0530 Subject: [PATCH] conflict 2 --- Script1.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Script1.sh b/Script1.sh index 0329397..83d6fe3 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,5 +4,5 @@ echo "We are learning Branching" echo "I am learning Devops" echo "Adding new line" echo "I am from Devops and cloud team" -echo "I am DevOps-2 and testing conflicts" +echo "I am DevOps-2 and testing conflicts 1"