From b9496b5ab4ce46fd19f0dd269668f521eb77172b Mon Sep 17 00:00:00 2001 From: RachelSlaybaugh Date: Sat, 28 Feb 2015 17:17:32 -0800 Subject: [PATCH 1/2] adding a mars md file. --- mars.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 mars.md diff --git a/mars.md b/mars.md new file mode 100644 index 0000000..b43f688 --- /dev/null +++ b/mars.md @@ -0,0 +1,7 @@ +# A collaborative file about Mars +----- + +Cold and dry, but everything is my favorite color +The two moons may be a problem for Wolfman +But the Mummy will appreciate the lack of humidity +We removed the conflict on this line. From d79572742fe4a34a03ece17829c1f43d9526d449 Mon Sep 17 00:00:00 2001 From: RachelSlaybaugh Date: Sun, 1 Mar 2015 22:53:50 -0800 Subject: [PATCH 2/2] changed mars.md for class. --- mars.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mars.md b/mars.md index b43f688..0828c61 100644 --- a/mars.md +++ b/mars.md @@ -4,4 +4,6 @@ Cold and dry, but everything is my favorite color The two moons may be a problem for Wolfman But the Mummy will appreciate the lack of humidity -We removed the conflict on this line. + +Mars is going to be a great adventure! +