From 8ed96a4e109400d693d33e3505e878e72815bbcd Mon Sep 17 00:00:00 2001 From: Jena Medeiros Date: Thu, 1 Oct 2015 20:10:50 -0400 Subject: [PATCH 1/4] Update index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 7713dc9..cd08755 100644 --- a/index.html +++ b/index.html @@ -1 +1 @@ -Goodbye world! +Hello world! From fa2d9b014b739a60b92fee926a583102b3652009 Mon Sep 17 00:00:00 2001 From: Jena Medeiros Date: Thu, 1 Oct 2015 20:25:44 -0400 Subject: [PATCH 2/4] YAY --- index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/index.html b/index.html index cd08755..454b6a1 100644 --- a/index.html +++ b/index.html @@ -1 +1,2 @@ Hello world! +jkfdlsajfklsda;jkl;fa \ No newline at end of file From c5920c47258edcd8d1170bacbd598b73ec156ce0 Mon Sep 17 00:00:00 2001 From: Jena Medeiros Date: Thu, 1 Oct 2015 20:53:07 -0400 Subject: [PATCH 3/4] yay --- index.html | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index 3e03923..bae8862 100644 --- a/index.html +++ b/index.html @@ -1,8 +1,6 @@ -<<<<<<< HEAD + Hello world! -jkfdlsajfklsda;jkl;fa -======= -Hello world, you're awesome! + Vestibulum id ligula porta felis euismod semper. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Nullam quis risus eget urna mollis ornare vel eu leo. Donec sed odio dui. ->>>>>>> 30d54249ad86e6d59488bf53dc1acff2a68d4da9 + From 406d3c92de3ee73fc8f174b8f4b4b7622f6bd232 Mon Sep 17 00:00:00 2001 From: Jena Medeiros Date: Thu, 1 Oct 2015 20:56:39 -0400 Subject: [PATCH 4/4] trying again weeeeeeeee --- index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/index.html b/index.html index bae8862..6a6e787 100644 --- a/index.html +++ b/index.html @@ -4,3 +4,4 @@ Vestibulum id ligula porta felis euismod semper. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Nullam quis risus eget urna mollis ornare vel eu leo. Donec sed odio dui. +jkfldsajkl;fdsa \ No newline at end of file