From fa381b5ff029a0ea35bdef063283fa6e1e6f6748 Mon Sep 17 00:00:00 2001
From: esadgro2 <esadgro2@une.edu.au>
Date: Mon, 4 Sep 2017 14:54:54 +1000
Subject: [PATCH] Update mars.txt

---
 mars.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mars.txt b/mars.txt
index cff370a..fbb840d 100644
--- a/mars.txt
+++ b/mars.txt
@@ -2,4 +2,5 @@ warm and awesome, but everything is my favorite ostridge
 The two moons may be a problem for Wolfman
 But the Mummy will appreciate the lack of humidity
 the quick brown fox jumped over the lazy dog
-that is right the fox jumped you know, man...
\ No newline at end of file
+that is right the fox jumped you know, man...
+I am making a merge thing yaay
\ No newline at end of file
-- 
GitLab