From 9ef5affb470467ec4e8f6123f9808d68df1c0896 Mon Sep 17 00:00:00 2001 From: kruev Date: Wed, 8 Feb 2017 14:27:48 -0500 Subject: [PATCH 1/2] Update index.html --- git_tst/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git_tst/index.html b/git_tst/index.html index a76fde1..f629ba2 100644 --- a/git_tst/index.html +++ b/git_tst/index.html @@ -6,7 +6,7 @@

CPS847 Group 6 Homepage

-

Welcome to the hompage for Group 6

+

THIS LINE WAS CHANGED!!!!!!

TODO: Add some more content!

From b8bb7ffdfaf50d19233df6bdde076cd4fca2b652 Mon Sep 17 00:00:00 2001 From: Troy Fernandes Date: Wed, 8 Feb 2017 14:28:37 -0500 Subject: [PATCH 2/2] Update index.html --- git_tst/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git_tst/index.html b/git_tst/index.html index a76fde1..697b5cc 100644 --- a/git_tst/index.html +++ b/git_tst/index.html @@ -6,7 +6,7 @@

CPS847 Group 6 Homepage

-

Welcome to the hompage for Group 6

+

trying to make a conflict

TODO: Add some more content!