From c24bb8b7384c548bc5f94ead9bf57b3b458d7b1f Mon Sep 17 00:00:00 2001 From: ximenamgarcia Date: Tue, 10 Aug 2021 14:45:27 -0400 Subject: [PATCH 1/2] Update file to show branch edits class demo --- mars.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mars.txt b/mars.txt index aab54d6..49acd0f 100644 --- a/mars.txt +++ b/mars.txt @@ -3,4 +3,4 @@ The two moons may be a problem for Wolfman But the mummy will appreciate the lack of humidity Let's figure out how to get to Mars first -Conflict has been resolved by change both lines into this one. +This is a new line Ximena added to branch XMG-pratice on 8/10/2021. \ No newline at end of file From 9fe79f8ad090559c0296489ff28ec5fde8d7acfb Mon Sep 17 00:00:00 2001 From: ximenamgarcia Date: Tue, 10 Aug 2021 14:58:39 -0400 Subject: [PATCH 2/2] new update new update --- mars.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mars.txt b/mars.txt index 49acd0f..1e9bd1d 100644 --- a/mars.txt +++ b/mars.txt @@ -3,4 +3,6 @@ The two moons may be a problem for Wolfman But the mummy will appreciate the lack of humidity Let's figure out how to get to Mars first -This is a new line Ximena added to branch XMG-pratice on 8/10/2021. \ No newline at end of file +This is a new line Ximena added to branch XMG-pratice on 8/10/2021. + +This is another line added to branch XMG-practice. \ No newline at end of file