diff --git a/MyScript.sh b/MyScript.sh new file mode 100644 index 00000000..dc6de782 --- /dev/null +++ b/MyScript.sh @@ -0,0 +1,10 @@ +echo "hello gitHub" +echo "this is my second try" +echo "this is my third try" +echo "this is my fourth try" +echo "this is myfourth try -1" +echo "this is my fifth try" +echo "this is my sixth try" +echo "this is my seventh try" +echo "this is my eighth try" +echo "this is my ninth try" \ No newline at end of file diff --git a/Script1.sh b/Script1.sh index d4e60905..cc8fae73 100644 --- a/Script1.sh +++ b/Script1.sh @@ -1,4 +1,3 @@ echo "We are trying this practical from linux EC2" echo "We are from batch-33 and learning git/gihub" -echo "We are learning Branching" -echo "I am learning Git" \ No newline at end of file +echo "hello world" \ No newline at end of file diff --git a/conflict_1 b/conflict_1 new file mode 100644 index 00000000..494d7812 --- /dev/null +++ b/conflict_1 @@ -0,0 +1,5 @@ +echo "We are trying this practical from linux EC2" +echo "We are from batch-33 and learning git/gihub" +echo "hello world" +echo "this is akshay" +echo "this is dipak" \ No newline at end of file