diff --git a/Script1.sh b/Script1.sh index f77c7f4..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" +echo "I am DevOps-2 and testing conflicts 1" diff --git a/Script2.sh b/Script2.sh index 867c7b9..3be2111 100644 --- a/Script2.sh +++ b/Script2.sh @@ -4,4 +4,4 @@ echo "Value of a" read a echo "Value of b" read b -echo "Hello value of a is $a and value of b is $b" +echo "Hello value of a is $a and value of b is $b 11"