From 1381426e437e3cf1302159be775dc033c83a0fcd Mon Sep 17 00:00:00 2001 From: Kseniia Epishina Date: Thu, 6 Oct 2016 18:09:07 -0400 Subject: [PATCH 01/31] adding main index file for the site --- index.html | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 index.html diff --git a/index.html b/index.html new file mode 100644 index 0000000..d2a4bf5 --- /dev/null +++ b/index.html @@ -0,0 +1,7 @@ + + + +

My First Heading

+

My first paragraph.

+ + From 721c695113f013858e5f1f637a884851a81bf183 Mon Sep 17 00:00:00 2001 From: Kseniia Epishina Date: Thu, 6 Oct 2016 18:56:09 -0400 Subject: [PATCH 02/31] YAY! --- index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index d2a4bf5..ee91886 100644 --- a/index.html +++ b/index.html @@ -2,6 +2,7 @@

My First Heading

-

My first paragraph.

+

My first paragraph. +By Kseniia Epishina

From 8dc7be446b45633094ed86b6c92da940bae24b96 Mon Sep 17 00:00:00 2001 From: Kseniia Epishina Date: Thu, 6 Oct 2016 19:07:33 -0400 Subject: [PATCH 03/31] creating Section1.html --- Section1.html | 1 + 1 file changed, 1 insertion(+) create mode 100644 Section1.html diff --git a/Section1.html b/Section1.html new file mode 100644 index 0000000..eca0ace --- /dev/null +++ b/Section1.html @@ -0,0 +1 @@ +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis porta orci nec lacinia finibus. In hac habitasse platea dictumst. Curabitur blandit bibendum facilisis. Proin consequat pellentesque felis, sit amet tempus eros imperdiet id. Vivamus nulla est, faucibus et rutrum eget, posuere id lectus. Phasellus venenatis pharetra felis, ac ultrices purus dictum eu. Quisque tincidunt neque non lacus facilisis, dignissim rutrum diam tempor. Vestibulum quis sagittis quam, quis dictum sem. Vivamus vulputate aliquet dolor. Cras id lorem ullamcorper, rutrum tellus at, pharetra risus. Donec sollicitudin lectus molestie sem rutrum tincidunt. Sed mollis, mi ut dictum egestas, libero mauris luctus risus, vitae euismod risus felis at augue. Nunc scelerisque tortor eu risus accumsan, at faucibus quam faucibus. Nulla vestibulum viverra facilisis. Donec lacus nunc, luctus sed viverra at, feugiat vitae ante. Nullam nulla magna, cursus eget magna posuere, elementum faucibus eros. \ No newline at end of file From 95f4de81f293896209ffcc199cebb8c5b2e1ba8a Mon Sep 17 00:00:00 2001 From: Kseniia Epishina Date: Thu, 6 Oct 2016 19:12:04 -0400 Subject: [PATCH 04/31] adding second paragraph to Section1.html --- Section1.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Section1.html b/Section1.html index eca0ace..92e76fc 100644 --- a/Section1.html +++ b/Section1.html @@ -1 +1,2 @@ -Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis porta orci nec lacinia finibus. In hac habitasse platea dictumst. Curabitur blandit bibendum facilisis. Proin consequat pellentesque felis, sit amet tempus eros imperdiet id. Vivamus nulla est, faucibus et rutrum eget, posuere id lectus. Phasellus venenatis pharetra felis, ac ultrices purus dictum eu. Quisque tincidunt neque non lacus facilisis, dignissim rutrum diam tempor. Vestibulum quis sagittis quam, quis dictum sem. Vivamus vulputate aliquet dolor. Cras id lorem ullamcorper, rutrum tellus at, pharetra risus. Donec sollicitudin lectus molestie sem rutrum tincidunt. Sed mollis, mi ut dictum egestas, libero mauris luctus risus, vitae euismod risus felis at augue. Nunc scelerisque tortor eu risus accumsan, at faucibus quam faucibus. Nulla vestibulum viverra facilisis. Donec lacus nunc, luctus sed viverra at, feugiat vitae ante. Nullam nulla magna, cursus eget magna posuere, elementum faucibus eros. \ No newline at end of file +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis porta orci nec lacinia finibus. In hac habitasse platea dictumst. Curabitur blandit bibendum facilisis. Proin consequat pellentesque felis, sit amet tempus eros imperdiet id. Vivamus nulla est, faucibus et rutrum eget, posuere id lectus. Phasellus venenatis pharetra felis, ac ultrices purus dictum eu. Quisque tincidunt neque non lacus facilisis, dignissim rutrum diam tempor. Vestibulum quis sagittis quam, quis dictum sem. Vivamus vulputate aliquet dolor. Cras id lorem ullamcorper, rutrum tellus at, pharetra risus. Donec sollicitudin lectus molestie sem rutrum tincidunt. Sed mollis, mi ut dictum egestas, libero mauris luctus risus, vitae euismod risus felis at augue. Nunc scelerisque tortor eu risus accumsan, at faucibus quam faucibus. Nulla vestibulum viverra facilisis. Donec lacus nunc, luctus sed viverra at, feugiat vitae ante. Nullam nulla magna, cursus eget magna posuere, elementum faucibus eros. +Ut tellus nisl, congue ac viverra eu, fermentum ut tellus. Donec vitae interdum tellus, eu eleifend ligula. Aliquam porttitor convallis nunc sit amet iaculis. Curabitur sed auctor lorem, et lobortis mi. In ex tortor, ornare sed risus vel, consectetur posuere risus. Nulla vitae sapien ut leo condimentum facilisis sit amet eu metus. Praesent quis magna pretium, sagittis arcu id, maximus ipsum. Pellentesque feugiat quis nunc id efficitur. Praesent vitae maximus nisi, quis porttitor ipsum. Praesent in ornare ex. \ No newline at end of file From 5493a1f28b4c681fad58d53f9b6c91651d053d43 Mon Sep 17 00:00:00 2001 From: Kseniia Epishina Date: Thu, 6 Oct 2016 19:15:33 -0400 Subject: [PATCH 05/31] adding third paragraph to Section1.html --- Section1.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Section1.html b/Section1.html index 92e76fc..9b482e8 100644 --- a/Section1.html +++ b/Section1.html @@ -1,2 +1,3 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis porta orci nec lacinia finibus. In hac habitasse platea dictumst. Curabitur blandit bibendum facilisis. Proin consequat pellentesque felis, sit amet tempus eros imperdiet id. Vivamus nulla est, faucibus et rutrum eget, posuere id lectus. Phasellus venenatis pharetra felis, ac ultrices purus dictum eu. Quisque tincidunt neque non lacus facilisis, dignissim rutrum diam tempor. Vestibulum quis sagittis quam, quis dictum sem. Vivamus vulputate aliquet dolor. Cras id lorem ullamcorper, rutrum tellus at, pharetra risus. Donec sollicitudin lectus molestie sem rutrum tincidunt. Sed mollis, mi ut dictum egestas, libero mauris luctus risus, vitae euismod risus felis at augue. Nunc scelerisque tortor eu risus accumsan, at faucibus quam faucibus. Nulla vestibulum viverra facilisis. Donec lacus nunc, luctus sed viverra at, feugiat vitae ante. Nullam nulla magna, cursus eget magna posuere, elementum faucibus eros. -Ut tellus nisl, congue ac viverra eu, fermentum ut tellus. Donec vitae interdum tellus, eu eleifend ligula. Aliquam porttitor convallis nunc sit amet iaculis. Curabitur sed auctor lorem, et lobortis mi. In ex tortor, ornare sed risus vel, consectetur posuere risus. Nulla vitae sapien ut leo condimentum facilisis sit amet eu metus. Praesent quis magna pretium, sagittis arcu id, maximus ipsum. Pellentesque feugiat quis nunc id efficitur. Praesent vitae maximus nisi, quis porttitor ipsum. Praesent in ornare ex. \ No newline at end of file +Ut tellus nisl, congue ac viverra eu, fermentum ut tellus. Donec vitae interdum tellus, eu eleifend ligula. Aliquam porttitor convallis nunc sit amet iaculis. Curabitur sed auctor lorem, et lobortis mi. In ex tortor, ornare sed risus vel, consectetur posuere risus. Nulla vitae sapien ut leo condimentum facilisis sit amet eu metus. Praesent quis magna pretium, sagittis arcu id, maximus ipsum. Pellentesque feugiat quis nunc id efficitur. Praesent vitae maximus nisi, quis porttitor ipsum. Praesent in ornare ex. +Suspendisse tristique convallis nisi, in euismod sapien faucibus sit amet. Sed consectetur felis in orci facilisis scelerisque. Suspendisse dapibus, orci nec sollicitudin rutrum, turpis ipsum vestibulum tellus, a sodales libero ex commodo mauris. Fusce viverra a risus eu imperdiet. Nulla lectus nunc, porta nec nisi in, cursus rutrum elit. Nunc sagittis convallis laoreet. In volutpat, ligula a convallis porta, nisl massa ornare diam, et placerat sem urna sed purus. Fusce eu condimentum leo. Curabitur ornare, urna ac rhoncus pharetra, quam sem cursus odio, vel pharetra dui libero eu nulla. Donec mattis in lacus in sollicitudin. Mauris efficitur nunc et porttitor malesuada. From 83361283ec0182912b4358e785818ec11b73c909 Mon Sep 17 00:00:00 2001 From: Kseniia Epishina Date: Thu, 13 Oct 2016 17:52:17 -0400 Subject: [PATCH 06/31] just added a bunch of files --- Section1.html | 1 + section2/Section2.html | 2 ++ section2/section3/Section3.html | 1 + section2/section3/section4/Section4.html | 1 + 4 files changed, 5 insertions(+) create mode 100644 section2/Section2.html create mode 100644 section2/section3/Section3.html create mode 100644 section2/section3/section4/Section4.html diff --git a/Section1.html b/Section1.html index 9b482e8..5dbd4c0 100644 --- a/Section1.html +++ b/Section1.html @@ -1,3 +1,4 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis porta orci nec lacinia finibus. In hac habitasse platea dictumst. Curabitur blandit bibendum facilisis. Proin consequat pellentesque felis, sit amet tempus eros imperdiet id. Vivamus nulla est, faucibus et rutrum eget, posuere id lectus. Phasellus venenatis pharetra felis, ac ultrices purus dictum eu. Quisque tincidunt neque non lacus facilisis, dignissim rutrum diam tempor. Vestibulum quis sagittis quam, quis dictum sem. Vivamus vulputate aliquet dolor. Cras id lorem ullamcorper, rutrum tellus at, pharetra risus. Donec sollicitudin lectus molestie sem rutrum tincidunt. Sed mollis, mi ut dictum egestas, libero mauris luctus risus, vitae euismod risus felis at augue. Nunc scelerisque tortor eu risus accumsan, at faucibus quam faucibus. Nulla vestibulum viverra facilisis. Donec lacus nunc, luctus sed viverra at, feugiat vitae ante. Nullam nulla magna, cursus eget magna posuere, elementum faucibus eros. Ut tellus nisl, congue ac viverra eu, fermentum ut tellus. Donec vitae interdum tellus, eu eleifend ligula. Aliquam porttitor convallis nunc sit amet iaculis. Curabitur sed auctor lorem, et lobortis mi. In ex tortor, ornare sed risus vel, consectetur posuere risus. Nulla vitae sapien ut leo condimentum facilisis sit amet eu metus. Praesent quis magna pretium, sagittis arcu id, maximus ipsum. Pellentesque feugiat quis nunc id efficitur. Praesent vitae maximus nisi, quis porttitor ipsum. Praesent in ornare ex. Suspendisse tristique convallis nisi, in euismod sapien faucibus sit amet. Sed consectetur felis in orci facilisis scelerisque. Suspendisse dapibus, orci nec sollicitudin rutrum, turpis ipsum vestibulum tellus, a sodales libero ex commodo mauris. Fusce viverra a risus eu imperdiet. Nulla lectus nunc, porta nec nisi in, cursus rutrum elit. Nunc sagittis convallis laoreet. In volutpat, ligula a convallis porta, nisl massa ornare diam, et placerat sem urna sed purus. Fusce eu condimentum leo. Curabitur ornare, urna ac rhoncus pharetra, quam sem cursus odio, vel pharetra dui libero eu nulla. Donec mattis in lacus in sollicitudin. Mauris efficitur nunc et porttitor malesuada. +Donec viverra, lacus nec luctus placerat, tellus lectus fringilla massa, sit amet pellentesque velit libero vitae lorem. Pellentesque nec dolor lectus. Fusce scelerisque non ligula tempor pharetra. Curabitur facilisis accumsan interdum. Cras odio odio, consectetur non molestie eget, aliquam imperdiet elit. Nam id egestas mauris. Donec quis justo nec mi vestibulum mollis. Quisque ullamcorper ante sit amet consectetur tincidunt. Donec lacinia blandit est, eu ultricies tellus mollis ut. Suspendisse nec mollis ex.a \ No newline at end of file diff --git a/section2/Section2.html b/section2/Section2.html new file mode 100644 index 0000000..38a3cd3 --- /dev/null +++ b/section2/Section2.html @@ -0,0 +1,2 @@ + +Donec viverra, lacus nec luctus placerat, tellus lectus fringilla massa, sit amet pellentesque velit libero vitae lorem. Pellentesque nec dolor lectus. Fusce scelerisque non ligula tempor pharetra. Curabitur facilisis accumsan interdum. Cras odio odio, consectetur non molestie eget, aliquam imperdiet elit. Nam id egestas mauris. Donec quis justo nec mi vestibulum mollis. Quisque ullamcorper ante sit amet consectetur tincidunt. Donec lacinia blandit est, eu ultricies tellus mollis ut. Suspendisse nec mollis ex. \ No newline at end of file diff --git a/section2/section3/Section3.html b/section2/section3/Section3.html new file mode 100644 index 0000000..78aa9d0 --- /dev/null +++ b/section2/section3/Section3.html @@ -0,0 +1 @@ +Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus vel convallis neque. Sed imperdiet arcu dignissim leo posuere pellentesque. In volutpat enim scelerisque, vulputate orci id, gravida ligula. Sed laoreet consequat sem, at viverra magna varius sit amet. Proin elit felis, semper vitae vulputate sit amet, vehicula ut nisi. Cras quam nisl, pretium at magna elementum, placerat suscipit lorem. Vestibulum et dictum justo. Pellentesque scelerisque velit ipsum, tincidunt tristique quam convallis vel. Sed nec cursus purus. Suspendisse rhoncus gravida mi, rutrum imperdiet justo elementum vel. Nulla et lacus elementum, rutrum risus in, pharetra enim. Nulla dui purus, accumsan id finibus vel, tincidunt sed felis. Suspendisse sed purus venenatis, pulvinar turpis non, viverra magna. \ No newline at end of file diff --git a/section2/section3/section4/Section4.html b/section2/section3/section4/Section4.html new file mode 100644 index 0000000..7508234 --- /dev/null +++ b/section2/section3/section4/Section4.html @@ -0,0 +1 @@ +Curabitur leo ligula, egestas quis mi pellentesque, efficitur sollicitudin dolor. Integer in viverra justo. Etiam congue, ante non pellentesque placerat, risus justo elementum sem, nec sollicitudin augue odio id purus. Donec suscipit semper dui, tempus pharetra enim. Fusce vitae urna justo. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Praesent posuere lacinia leo sed cursus. Fusce eu leo et enim hendrerit bibendum sed at magna. Cras semper semper diam, at pharetra nisl congue eu. Fusce vitae urna ipsum. Mauris te \ No newline at end of file From 507610a612d55aa5b8b881eae4fb01979a60a365 Mon Sep 17 00:00:00 2001 From: Kseniia Epishina Date: Thu, 13 Oct 2016 18:10:21 -0400 Subject: [PATCH 07/31] renamed Section.html --- section2/section3/{Section3.html => section3new.html} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename section2/section3/{Section3.html => section3new.html} (100%) diff --git a/section2/section3/Section3.html b/section2/section3/section3new.html similarity index 100% rename from section2/section3/Section3.html rename to section2/section3/section3new.html From 38ee71d44f289503720a4923b2d660cf1a5aaa6c Mon Sep 17 00:00:00 2001 From: Kseniia Epishina Date: Thu, 13 Oct 2016 18:23:10 -0400 Subject: [PATCH 08/31] changing all names --- section2/{Section2.html => Section2new.html.html} | 0 section2/section3/{ => section4}/section3new.html | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename section2/{Section2.html => Section2new.html.html} (100%) rename section2/section3/{ => section4}/section3new.html (100%) diff --git a/section2/Section2.html b/section2/Section2new.html.html similarity index 100% rename from section2/Section2.html rename to section2/Section2new.html.html diff --git a/section2/section3/section3new.html b/section2/section3/section4/section3new.html similarity index 100% rename from section2/section3/section3new.html rename to section2/section3/section4/section3new.html From b2886cc9fa2a2a0c18fb043d12a3ccd9ec609ec5 Mon Sep 17 00:00:00 2001 From: Kseniia Epishina Date: Thu, 13 Oct 2016 18:25:44 -0400 Subject: [PATCH 09/31] moving section3new back to its directory --- section2/section3/{section4 => }/section3new.html | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename section2/section3/{section4 => }/section3new.html (100%) diff --git a/section2/section3/section4/section3new.html b/section2/section3/section3new.html similarity index 100% rename from section2/section3/section4/section3new.html rename to section2/section3/section3new.html From a4a7c92dbd4b5ea7070af316c3128903428f99ed Mon Sep 17 00:00:00 2001 From: Kseniia Epishina Date: Thu, 13 Oct 2016 18:46:02 -0400 Subject: [PATCH 10/31] deleted section2 and children --- Section1.html => section1new.html.html | 0 section2/Section2new.html.html | 2 -- section2/section3/section3new.html | 1 - section2/section3/section4/Section4.html | 1 - 4 files changed, 4 deletions(-) rename Section1.html => section1new.html.html (100%) delete mode 100644 section2/Section2new.html.html delete mode 100644 section2/section3/section3new.html delete mode 100644 section2/section3/section4/Section4.html diff --git a/Section1.html b/section1new.html.html similarity index 100% rename from Section1.html rename to section1new.html.html diff --git a/section2/Section2new.html.html b/section2/Section2new.html.html deleted file mode 100644 index 38a3cd3..0000000 --- a/section2/Section2new.html.html +++ /dev/null @@ -1,2 +0,0 @@ - -Donec viverra, lacus nec luctus placerat, tellus lectus fringilla massa, sit amet pellentesque velit libero vitae lorem. Pellentesque nec dolor lectus. Fusce scelerisque non ligula tempor pharetra. Curabitur facilisis accumsan interdum. Cras odio odio, consectetur non molestie eget, aliquam imperdiet elit. Nam id egestas mauris. Donec quis justo nec mi vestibulum mollis. Quisque ullamcorper ante sit amet consectetur tincidunt. Donec lacinia blandit est, eu ultricies tellus mollis ut. Suspendisse nec mollis ex. \ No newline at end of file diff --git a/section2/section3/section3new.html b/section2/section3/section3new.html deleted file mode 100644 index 78aa9d0..0000000 --- a/section2/section3/section3new.html +++ /dev/null @@ -1 +0,0 @@ -Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus vel convallis neque. Sed imperdiet arcu dignissim leo posuere pellentesque. In volutpat enim scelerisque, vulputate orci id, gravida ligula. Sed laoreet consequat sem, at viverra magna varius sit amet. Proin elit felis, semper vitae vulputate sit amet, vehicula ut nisi. Cras quam nisl, pretium at magna elementum, placerat suscipit lorem. Vestibulum et dictum justo. Pellentesque scelerisque velit ipsum, tincidunt tristique quam convallis vel. Sed nec cursus purus. Suspendisse rhoncus gravida mi, rutrum imperdiet justo elementum vel. Nulla et lacus elementum, rutrum risus in, pharetra enim. Nulla dui purus, accumsan id finibus vel, tincidunt sed felis. Suspendisse sed purus venenatis, pulvinar turpis non, viverra magna. \ No newline at end of file diff --git a/section2/section3/section4/Section4.html b/section2/section3/section4/Section4.html deleted file mode 100644 index 7508234..0000000 --- a/section2/section3/section4/Section4.html +++ /dev/null @@ -1 +0,0 @@ -Curabitur leo ligula, egestas quis mi pellentesque, efficitur sollicitudin dolor. Integer in viverra justo. Etiam congue, ante non pellentesque placerat, risus justo elementum sem, nec sollicitudin augue odio id purus. Donec suscipit semper dui, tempus pharetra enim. Fusce vitae urna justo. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Praesent posuere lacinia leo sed cursus. Fusce eu leo et enim hendrerit bibendum sed at magna. Cras semper semper diam, at pharetra nisl congue eu. Fusce vitae urna ipsum. Mauris te \ No newline at end of file From fa9d37095f69f7e7ea5df01b7b406d613631b229 Mon Sep 17 00:00:00 2001 From: Kseniia Epishina Date: Thu, 13 Oct 2016 19:01:37 -0400 Subject: [PATCH 11/31] done with intermediate --- .gitignore | 1 + section1new.html.html => Section1.html.html | 0 2 files changed, 1 insertion(+) rename section1new.html.html => Section1.html.html (100%) diff --git a/.gitignore b/.gitignore index 04aed3b..09aeadc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.DS_Store # Ignore configuration files that may contain sensitive information. sites/*/*settings*.php diff --git a/section1new.html.html b/Section1.html.html similarity index 100% rename from section1new.html.html rename to Section1.html.html From 815c5159f8660f4224f93546b5e4b2c4ddb6a4d0 Mon Sep 17 00:00:00 2001 From: Kseniia Epishina Date: Fri, 28 Oct 2016 16:10:56 -0400 Subject: [PATCH 12/31] adding personal html page prior to rebase --- kseniiaepishina.html | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 kseniiaepishina.html diff --git a/kseniiaepishina.html b/kseniiaepishina.html new file mode 100644 index 0000000..9567f08 --- /dev/null +++ b/kseniiaepishina.html @@ -0,0 +1,21 @@ + + + + + + + The HTML5 Herald + + + + + + + + + + + + \ No newline at end of file From 1968ff8356afb563ab0eb79e1a854503a510db7a Mon Sep 17 00:00:00 2001 From: Kseniia Epishina Date: Fri, 28 Oct 2016 16:19:05 -0400 Subject: [PATCH 13/31] more changes prior to rebase --- README.md | 4 ++++ kseniiaepishina.html | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 52c5cf6..0c0b744 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,6 @@ # 424-web-example Learning example repository for ISOM 424 students. +##Introduction +This project enables us to learn source code control using Git. +##Pkurpose +To have code we can use for hands on exercises. \ No newline at end of file diff --git a/kseniiaepishina.html b/kseniiaepishina.html index 9567f08..b086e00 100644 --- a/kseniiaepishina.html +++ b/kseniiaepishina.html @@ -1,5 +1,7 @@ - + From ef1c89a2828e7dd9b064629e9fb0c402a81d3ca2 Mon Sep 17 00:00:00 2001 From: Kseniia Epishina Date: Fri, 28 Oct 2016 17:47:12 -0400 Subject: [PATCH 14/31] master branch prior to conflicts --- Section1.html.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Section1.html.html b/Section1.html.html index 5dbd4c0..b2f8b88 100644 --- a/Section1.html.html +++ b/Section1.html.html @@ -1,3 +1,6 @@ + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis porta orci nec lacinia finibus. In hac habitasse platea dictumst. Curabitur blandit bibendum facilisis. Proin consequat pellentesque felis, sit amet tempus eros imperdiet id. Vivamus nulla est, faucibus et rutrum eget, posuere id lectus. Phasellus venenatis pharetra felis, ac ultrices purus dictum eu. Quisque tincidunt neque non lacus facilisis, dignissim rutrum diam tempor. Vestibulum quis sagittis quam, quis dictum sem. Vivamus vulputate aliquet dolor. Cras id lorem ullamcorper, rutrum tellus at, pharetra risus. Donec sollicitudin lectus molestie sem rutrum tincidunt. Sed mollis, mi ut dictum egestas, libero mauris luctus risus, vitae euismod risus felis at augue. Nunc scelerisque tortor eu risus accumsan, at faucibus quam faucibus. Nulla vestibulum viverra facilisis. Donec lacus nunc, luctus sed viverra at, feugiat vitae ante. Nullam nulla magna, cursus eget magna posuere, elementum faucibus eros. Ut tellus nisl, congue ac viverra eu, fermentum ut tellus. Donec vitae interdum tellus, eu eleifend ligula. Aliquam porttitor convallis nunc sit amet iaculis. Curabitur sed auctor lorem, et lobortis mi. In ex tortor, ornare sed risus vel, consectetur posuere risus. Nulla vitae sapien ut leo condimentum facilisis sit amet eu metus. Praesent quis magna pretium, sagittis arcu id, maximus ipsum. Pellentesque feugiat quis nunc id efficitur. Praesent vitae maximus nisi, quis porttitor ipsum. Praesent in ornare ex. Suspendisse tristique convallis nisi, in euismod sapien faucibus sit amet. Sed consectetur felis in orci facilisis scelerisque. Suspendisse dapibus, orci nec sollicitudin rutrum, turpis ipsum vestibulum tellus, a sodales libero ex commodo mauris. Fusce viverra a risus eu imperdiet. Nulla lectus nunc, porta nec nisi in, cursus rutrum elit. Nunc sagittis convallis laoreet. In volutpat, ligula a convallis porta, nisl massa ornare diam, et placerat sem urna sed purus. Fusce eu condimentum leo. Curabitur ornare, urna ac rhoncus pharetra, quam sem cursus odio, vel pharetra dui libero eu nulla. Donec mattis in lacus in sollicitudin. Mauris efficitur nunc et porttitor malesuada. From c4ab853e1085179d972fd58c9e62d66e9b1c95b3 Mon Sep 17 00:00:00 2001 From: Kseniia Epishina Date: Fri, 28 Oct 2016 17:53:02 -0400 Subject: [PATCH 15/31] conflictbranch now has a fixed Section1.html --- Section1.html.html | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Section1.html.html b/Section1.html.html index b2f8b88..ecaf70b 100644 --- a/Section1.html.html +++ b/Section1.html.html @@ -1,7 +1,11 @@ + + -Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis porta orci nec lacinia finibus. In hac habitasse platea dictumst. Curabitur blandit bibendum facilisis. Proin consequat pellentesque felis, sit amet tempus eros imperdiet id. Vivamus nulla est, faucibus et rutrum eget, posuere id lectus. Phasellus venenatis pharetra felis, ac ultrices purus dictum eu. Quisque tincidunt neque non lacus facilisis, dignissim rutrum diam tempor. Vestibulum quis sagittis quam, quis dictum sem. Vivamus vulputate aliquet dolor. Cras id lorem ullamcorper, rutrum tellus at, pharetra risus. Donec sollicitudin lectus molestie sem rutrum tincidunt. Sed mollis, mi ut dictum egestas, libero mauris luctus risus, vitae euismod risus felis at augue. Nunc scelerisque tortor eu risus accumsan, at faucibus quam faucibus. Nulla vestibulum viverra facilisis. Donec lacus nunc, luctus sed viverra at, feugiat vitae ante. Nullam nulla magna, cursus eget magna posuere, elementum faucibus eros. -Ut tellus nisl, congue ac viverra eu, fermentum ut tellus. Donec vitae interdum tellus, eu eleifend ligula. Aliquam porttitor convallis nunc sit amet iaculis. Curabitur sed auctor lorem, et lobortis mi. In ex tortor, ornare sed risus vel, consectetur posuere risus. Nulla vitae sapien ut leo condimentum facilisis sit amet eu metus. Praesent quis magna pretium, sagittis arcu id, maximus ipsum. Pellentesque feugiat quis nunc id efficitur. Praesent vitae maximus nisi, quis porttitor ipsum. Praesent in ornare ex. -Suspendisse tristique convallis nisi, in euismod sapien faucibus sit amet. Sed consectetur felis in orci facilisis scelerisque. Suspendisse dapibus, orci nec sollicitudin rutrum, turpis ipsum vestibulum tellus, a sodales libero ex commodo mauris. Fusce viverra a risus eu imperdiet. Nulla lectus nunc, porta nec nisi in, cursus rutrum elit. Nunc sagittis convallis laoreet. In volutpat, ligula a convallis porta, nisl massa ornare diam, et placerat sem urna sed purus. Fusce eu condimentum leo. Curabitur ornare, urna ac rhoncus pharetra, quam sem cursus odio, vel pharetra dui libero eu nulla. Donec mattis in lacus in sollicitudin. Mauris efficitur nunc et porttitor malesuada. -Donec viverra, lacus nec luctus placerat, tellus lectus fringilla massa, sit amet pellentesque velit libero vitae lorem. Pellentesque nec dolor lectus. Fusce scelerisque non ligula tempor pharetra. Curabitur facilisis accumsan interdum. Cras odio odio, consectetur non molestie eget, aliquam imperdiet elit. Nam id egestas mauris. Donec quis justo nec mi vestibulum mollis. Quisque ullamcorper ante sit amet consectetur tincidunt. Donec lacinia blandit est, eu ultricies tellus mollis ut. Suspendisse nec mollis ex.a \ No newline at end of file + +

Conflict!

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis porta orci nec lacinia finibus. In hac habitasse platea dictumst. Curabitur blandit bibendum facilisis. Proin consequat pellentesque felis, sit amet tempus eros imperdiet id. Vivamus nulla est, faucibus et rutrum eget, posuere id lectus. Phasellus venenatis pharetra felis, ac ultrices purus dictum eu. Quisque tincidunt neque non lacus facilisis, dignissim rutrum diam tempor. Vestibulum quis sagittis quam, quis dictum sem. Vivamus vulputate aliquet dolor. Cras id lorem ullamcorper, rutrum tellus at, pharetra risus. Donec sollicitudin lectus molestie sem rutrum tincidunt. Sed mollis, mi ut dictum egestas, libero mauris luctus risus, vitae euismod risus felis at augue. Nunc scelerisque tortor eu risus accumsan, at faucibus quam faucibus. Nulla vestibulum viverra facilisis. Donec lacus nunc, luctus sed viverra at, feugiat vitae ante. Nullam nulla magna, cursus eget magna posuere, elementum faucibus eros. +

+ + \ No newline at end of file From a5bacc5f6ed3c9ca9a1b43e1a48b9f0781aa4ec3 Mon Sep 17 00:00:00 2001 From: Kseniia Epishina Date: Sat, 29 Oct 2016 19:08:48 -0400 Subject: [PATCH 16/31] master Section1.html first para gone --- Section1.html.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Section1.html.html b/Section1.html.html index 5dbd4c0..c0297e2 100644 --- a/Section1.html.html +++ b/Section1.html.html @@ -1,4 +1,7 @@ -Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis porta orci nec lacinia finibus. In hac habitasse platea dictumst. Curabitur blandit bibendum facilisis. Proin consequat pellentesque felis, sit amet tempus eros imperdiet id. Vivamus nulla est, faucibus et rutrum eget, posuere id lectus. Phasellus venenatis pharetra felis, ac ultrices purus dictum eu. Quisque tincidunt neque non lacus facilisis, dignissim rutrum diam tempor. Vestibulum quis sagittis quam, quis dictum sem. Vivamus vulputate aliquet dolor. Cras id lorem ullamcorper, rutrum tellus at, pharetra risus. Donec sollicitudin lectus molestie sem rutrum tincidunt. Sed mollis, mi ut dictum egestas, libero mauris luctus risus, vitae euismod risus felis at augue. Nunc scelerisque tortor eu risus accumsan, at faucibus quam faucibus. Nulla vestibulum viverra facilisis. Donec lacus nunc, luctus sed viverra at, feugiat vitae ante. Nullam nulla magna, cursus eget magna posuere, elementum faucibus eros. + +

I deleted the first paragraph!

Ut tellus nisl, congue ac viverra eu, fermentum ut tellus. Donec vitae interdum tellus, eu eleifend ligula. Aliquam porttitor convallis nunc sit amet iaculis. Curabitur sed auctor lorem, et lobortis mi. In ex tortor, ornare sed risus vel, consectetur posuere risus. Nulla vitae sapien ut leo condimentum facilisis sit amet eu metus. Praesent quis magna pretium, sagittis arcu id, maximus ipsum. Pellentesque feugiat quis nunc id efficitur. Praesent vitae maximus nisi, quis porttitor ipsum. Praesent in ornare ex. Suspendisse tristique convallis nisi, in euismod sapien faucibus sit amet. Sed consectetur felis in orci facilisis scelerisque. Suspendisse dapibus, orci nec sollicitudin rutrum, turpis ipsum vestibulum tellus, a sodales libero ex commodo mauris. Fusce viverra a risus eu imperdiet. Nulla lectus nunc, porta nec nisi in, cursus rutrum elit. Nunc sagittis convallis laoreet. In volutpat, ligula a convallis porta, nisl massa ornare diam, et placerat sem urna sed purus. Fusce eu condimentum leo. Curabitur ornare, urna ac rhoncus pharetra, quam sem cursus odio, vel pharetra dui libero eu nulla. Donec mattis in lacus in sollicitudin. Mauris efficitur nunc et porttitor malesuada. Donec viverra, lacus nec luctus placerat, tellus lectus fringilla massa, sit amet pellentesque velit libero vitae lorem. Pellentesque nec dolor lectus. Fusce scelerisque non ligula tempor pharetra. Curabitur facilisis accumsan interdum. Cras odio odio, consectetur non molestie eget, aliquam imperdiet elit. Nam id egestas mauris. Donec quis justo nec mi vestibulum mollis. Quisque ullamcorper ante sit amet consectetur tincidunt. Donec lacinia blandit est, eu ultricies tellus mollis ut. Suspendisse nec mollis ex.a \ No newline at end of file From ce4ad459ef9807d9d179ed0bb17c8e55a5213794 Mon Sep 17 00:00:00 2001 From: Kseniia Epishina Date: Sat, 29 Oct 2016 19:31:31 -0400 Subject: [PATCH 17/31] section 1 comment changed --- Section1.html.html | 1 + 1 file changed, 1 insertion(+) diff --git a/Section1.html.html b/Section1.html.html index ecaf70b..c029ec7 100644 --- a/Section1.html.html +++ b/Section1.html.html @@ -2,6 +2,7 @@

Conflict!

From dc46d1749affc7a615ebc5f348912d5ea5dccdf6 Mon Sep 17 00:00:00 2001 From: Kseniia Epishina Date: Sat, 29 Oct 2016 21:27:37 -0400 Subject: [PATCH 18/31] adding install instructions --- install.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 install.md diff --git a/install.md b/install.md new file mode 100644 index 0000000..6e79781 --- /dev/null +++ b/install.md @@ -0,0 +1,4 @@ +#Installation Instructions +follow these instructions when installing this code +##Procedure +upload to standard Apache web server \ No newline at end of file From 8878c3974df2e9829879c0ae25c7b38d6c0f6b09 Mon Sep 17 00:00:00 2001 From: Kseniia Epishina Date: Sat, 29 Oct 2016 22:08:33 -0400 Subject: [PATCH 19/31] updating .gitignore for .orig --- .gitignore | 1 + Section1.html_BACKUP_10440.html | 22 ++++++++++++++++++++++ Section1.html_BACKUP_7432.html | 22 ++++++++++++++++++++++ Section1.html_BASE_10440.html | 4 ++++ Section1.html_BASE_7432.html | 4 ++++ Section1.html_LOCAL_10440.html | 12 ++++++++++++ Section1.html_LOCAL_7432.html | 12 ++++++++++++ Section1.html_REMOTE_10440.html | 7 +++++++ Section1.html_REMOTE_7432.html | 7 +++++++ 9 files changed, 91 insertions(+) create mode 100644 Section1.html_BACKUP_10440.html create mode 100644 Section1.html_BACKUP_7432.html create mode 100644 Section1.html_BASE_10440.html create mode 100644 Section1.html_BASE_7432.html create mode 100644 Section1.html_LOCAL_10440.html create mode 100644 Section1.html_LOCAL_7432.html create mode 100644 Section1.html_REMOTE_10440.html create mode 100644 Section1.html_REMOTE_7432.html diff --git a/.gitignore b/.gitignore index 09aeadc..ba02094 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .DS_Store +*.orig # Ignore configuration files that may contain sensitive information. sites/*/*settings*.php diff --git a/Section1.html_BACKUP_10440.html b/Section1.html_BACKUP_10440.html new file mode 100644 index 0000000..fe28ff6 --- /dev/null +++ b/Section1.html_BACKUP_10440.html @@ -0,0 +1,22 @@ +<<<<<<< HEAD + + + + +

Conflict!

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis porta orci nec lacinia finibus. In hac habitasse platea dictumst. Curabitur blandit bibendum facilisis. Proin consequat pellentesque felis, sit amet tempus eros imperdiet id. Vivamus nulla est, faucibus et rutrum eget, posuere id lectus. Phasellus venenatis pharetra felis, ac ultrices purus dictum eu. Quisque tincidunt neque non lacus facilisis, dignissim rutrum diam tempor. Vestibulum quis sagittis quam, quis dictum sem. Vivamus vulputate aliquet dolor. Cras id lorem ullamcorper, rutrum tellus at, pharetra risus. Donec sollicitudin lectus molestie sem rutrum tincidunt. Sed mollis, mi ut dictum egestas, libero mauris luctus risus, vitae euismod risus felis at augue. Nunc scelerisque tortor eu risus accumsan, at faucibus quam faucibus. Nulla vestibulum viverra facilisis. Donec lacus nunc, luctus sed viverra at, feugiat vitae ante. Nullam nulla magna, cursus eget magna posuere, elementum faucibus eros. +

+ + +======= + +

I deleted the first paragraph!

+Ut tellus nisl, congue ac viverra eu, fermentum ut tellus. Donec vitae interdum tellus, eu eleifend ligula. Aliquam porttitor convallis nunc sit amet iaculis. Curabitur sed auctor lorem, et lobortis mi. In ex tortor, ornare sed risus vel, consectetur posuere risus. Nulla vitae sapien ut leo condimentum facilisis sit amet eu metus. Praesent quis magna pretium, sagittis arcu id, maximus ipsum. Pellentesque feugiat quis nunc id efficitur. Praesent vitae maximus nisi, quis porttitor ipsum. Praesent in ornare ex. +Suspendisse tristique convallis nisi, in euismod sapien faucibus sit amet. Sed consectetur felis in orci facilisis scelerisque. Suspendisse dapibus, orci nec sollicitudin rutrum, turpis ipsum vestibulum tellus, a sodales libero ex commodo mauris. Fusce viverra a risus eu imperdiet. Nulla lectus nunc, porta nec nisi in, cursus rutrum elit. Nunc sagittis convallis laoreet. In volutpat, ligula a convallis porta, nisl massa ornare diam, et placerat sem urna sed purus. Fusce eu condimentum leo. Curabitur ornare, urna ac rhoncus pharetra, quam sem cursus odio, vel pharetra dui libero eu nulla. Donec mattis in lacus in sollicitudin. Mauris efficitur nunc et porttitor malesuada. +Donec viverra, lacus nec luctus placerat, tellus lectus fringilla massa, sit amet pellentesque velit libero vitae lorem. Pellentesque nec dolor lectus. Fusce scelerisque non ligula tempor pharetra. Curabitur facilisis accumsan interdum. Cras odio odio, consectetur non molestie eget, aliquam imperdiet elit. Nam id egestas mauris. Donec quis justo nec mi vestibulum mollis. Quisque ullamcorper ante sit amet consectetur tincidunt. Donec lacinia blandit est, eu ultricies tellus mollis ut. Suspendisse nec mollis ex.a +>>>>>>> conflictbranch1 diff --git a/Section1.html_BACKUP_7432.html b/Section1.html_BACKUP_7432.html new file mode 100644 index 0000000..fe28ff6 --- /dev/null +++ b/Section1.html_BACKUP_7432.html @@ -0,0 +1,22 @@ +<<<<<<< HEAD + + + + +

Conflict!

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis porta orci nec lacinia finibus. In hac habitasse platea dictumst. Curabitur blandit bibendum facilisis. Proin consequat pellentesque felis, sit amet tempus eros imperdiet id. Vivamus nulla est, faucibus et rutrum eget, posuere id lectus. Phasellus venenatis pharetra felis, ac ultrices purus dictum eu. Quisque tincidunt neque non lacus facilisis, dignissim rutrum diam tempor. Vestibulum quis sagittis quam, quis dictum sem. Vivamus vulputate aliquet dolor. Cras id lorem ullamcorper, rutrum tellus at, pharetra risus. Donec sollicitudin lectus molestie sem rutrum tincidunt. Sed mollis, mi ut dictum egestas, libero mauris luctus risus, vitae euismod risus felis at augue. Nunc scelerisque tortor eu risus accumsan, at faucibus quam faucibus. Nulla vestibulum viverra facilisis. Donec lacus nunc, luctus sed viverra at, feugiat vitae ante. Nullam nulla magna, cursus eget magna posuere, elementum faucibus eros. +

+ + +======= + +

I deleted the first paragraph!

+Ut tellus nisl, congue ac viverra eu, fermentum ut tellus. Donec vitae interdum tellus, eu eleifend ligula. Aliquam porttitor convallis nunc sit amet iaculis. Curabitur sed auctor lorem, et lobortis mi. In ex tortor, ornare sed risus vel, consectetur posuere risus. Nulla vitae sapien ut leo condimentum facilisis sit amet eu metus. Praesent quis magna pretium, sagittis arcu id, maximus ipsum. Pellentesque feugiat quis nunc id efficitur. Praesent vitae maximus nisi, quis porttitor ipsum. Praesent in ornare ex. +Suspendisse tristique convallis nisi, in euismod sapien faucibus sit amet. Sed consectetur felis in orci facilisis scelerisque. Suspendisse dapibus, orci nec sollicitudin rutrum, turpis ipsum vestibulum tellus, a sodales libero ex commodo mauris. Fusce viverra a risus eu imperdiet. Nulla lectus nunc, porta nec nisi in, cursus rutrum elit. Nunc sagittis convallis laoreet. In volutpat, ligula a convallis porta, nisl massa ornare diam, et placerat sem urna sed purus. Fusce eu condimentum leo. Curabitur ornare, urna ac rhoncus pharetra, quam sem cursus odio, vel pharetra dui libero eu nulla. Donec mattis in lacus in sollicitudin. Mauris efficitur nunc et porttitor malesuada. +Donec viverra, lacus nec luctus placerat, tellus lectus fringilla massa, sit amet pellentesque velit libero vitae lorem. Pellentesque nec dolor lectus. Fusce scelerisque non ligula tempor pharetra. Curabitur facilisis accumsan interdum. Cras odio odio, consectetur non molestie eget, aliquam imperdiet elit. Nam id egestas mauris. Donec quis justo nec mi vestibulum mollis. Quisque ullamcorper ante sit amet consectetur tincidunt. Donec lacinia blandit est, eu ultricies tellus mollis ut. Suspendisse nec mollis ex.a +>>>>>>> conflictbranch1 diff --git a/Section1.html_BASE_10440.html b/Section1.html_BASE_10440.html new file mode 100644 index 0000000..5dbd4c0 --- /dev/null +++ b/Section1.html_BASE_10440.html @@ -0,0 +1,4 @@ +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis porta orci nec lacinia finibus. In hac habitasse platea dictumst. Curabitur blandit bibendum facilisis. Proin consequat pellentesque felis, sit amet tempus eros imperdiet id. Vivamus nulla est, faucibus et rutrum eget, posuere id lectus. Phasellus venenatis pharetra felis, ac ultrices purus dictum eu. Quisque tincidunt neque non lacus facilisis, dignissim rutrum diam tempor. Vestibulum quis sagittis quam, quis dictum sem. Vivamus vulputate aliquet dolor. Cras id lorem ullamcorper, rutrum tellus at, pharetra risus. Donec sollicitudin lectus molestie sem rutrum tincidunt. Sed mollis, mi ut dictum egestas, libero mauris luctus risus, vitae euismod risus felis at augue. Nunc scelerisque tortor eu risus accumsan, at faucibus quam faucibus. Nulla vestibulum viverra facilisis. Donec lacus nunc, luctus sed viverra at, feugiat vitae ante. Nullam nulla magna, cursus eget magna posuere, elementum faucibus eros. +Ut tellus nisl, congue ac viverra eu, fermentum ut tellus. Donec vitae interdum tellus, eu eleifend ligula. Aliquam porttitor convallis nunc sit amet iaculis. Curabitur sed auctor lorem, et lobortis mi. In ex tortor, ornare sed risus vel, consectetur posuere risus. Nulla vitae sapien ut leo condimentum facilisis sit amet eu metus. Praesent quis magna pretium, sagittis arcu id, maximus ipsum. Pellentesque feugiat quis nunc id efficitur. Praesent vitae maximus nisi, quis porttitor ipsum. Praesent in ornare ex. +Suspendisse tristique convallis nisi, in euismod sapien faucibus sit amet. Sed consectetur felis in orci facilisis scelerisque. Suspendisse dapibus, orci nec sollicitudin rutrum, turpis ipsum vestibulum tellus, a sodales libero ex commodo mauris. Fusce viverra a risus eu imperdiet. Nulla lectus nunc, porta nec nisi in, cursus rutrum elit. Nunc sagittis convallis laoreet. In volutpat, ligula a convallis porta, nisl massa ornare diam, et placerat sem urna sed purus. Fusce eu condimentum leo. Curabitur ornare, urna ac rhoncus pharetra, quam sem cursus odio, vel pharetra dui libero eu nulla. Donec mattis in lacus in sollicitudin. Mauris efficitur nunc et porttitor malesuada. +Donec viverra, lacus nec luctus placerat, tellus lectus fringilla massa, sit amet pellentesque velit libero vitae lorem. Pellentesque nec dolor lectus. Fusce scelerisque non ligula tempor pharetra. Curabitur facilisis accumsan interdum. Cras odio odio, consectetur non molestie eget, aliquam imperdiet elit. Nam id egestas mauris. Donec quis justo nec mi vestibulum mollis. Quisque ullamcorper ante sit amet consectetur tincidunt. Donec lacinia blandit est, eu ultricies tellus mollis ut. Suspendisse nec mollis ex.a \ No newline at end of file diff --git a/Section1.html_BASE_7432.html b/Section1.html_BASE_7432.html new file mode 100644 index 0000000..5dbd4c0 --- /dev/null +++ b/Section1.html_BASE_7432.html @@ -0,0 +1,4 @@ +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis porta orci nec lacinia finibus. In hac habitasse platea dictumst. Curabitur blandit bibendum facilisis. Proin consequat pellentesque felis, sit amet tempus eros imperdiet id. Vivamus nulla est, faucibus et rutrum eget, posuere id lectus. Phasellus venenatis pharetra felis, ac ultrices purus dictum eu. Quisque tincidunt neque non lacus facilisis, dignissim rutrum diam tempor. Vestibulum quis sagittis quam, quis dictum sem. Vivamus vulputate aliquet dolor. Cras id lorem ullamcorper, rutrum tellus at, pharetra risus. Donec sollicitudin lectus molestie sem rutrum tincidunt. Sed mollis, mi ut dictum egestas, libero mauris luctus risus, vitae euismod risus felis at augue. Nunc scelerisque tortor eu risus accumsan, at faucibus quam faucibus. Nulla vestibulum viverra facilisis. Donec lacus nunc, luctus sed viverra at, feugiat vitae ante. Nullam nulla magna, cursus eget magna posuere, elementum faucibus eros. +Ut tellus nisl, congue ac viverra eu, fermentum ut tellus. Donec vitae interdum tellus, eu eleifend ligula. Aliquam porttitor convallis nunc sit amet iaculis. Curabitur sed auctor lorem, et lobortis mi. In ex tortor, ornare sed risus vel, consectetur posuere risus. Nulla vitae sapien ut leo condimentum facilisis sit amet eu metus. Praesent quis magna pretium, sagittis arcu id, maximus ipsum. Pellentesque feugiat quis nunc id efficitur. Praesent vitae maximus nisi, quis porttitor ipsum. Praesent in ornare ex. +Suspendisse tristique convallis nisi, in euismod sapien faucibus sit amet. Sed consectetur felis in orci facilisis scelerisque. Suspendisse dapibus, orci nec sollicitudin rutrum, turpis ipsum vestibulum tellus, a sodales libero ex commodo mauris. Fusce viverra a risus eu imperdiet. Nulla lectus nunc, porta nec nisi in, cursus rutrum elit. Nunc sagittis convallis laoreet. In volutpat, ligula a convallis porta, nisl massa ornare diam, et placerat sem urna sed purus. Fusce eu condimentum leo. Curabitur ornare, urna ac rhoncus pharetra, quam sem cursus odio, vel pharetra dui libero eu nulla. Donec mattis in lacus in sollicitudin. Mauris efficitur nunc et porttitor malesuada. +Donec viverra, lacus nec luctus placerat, tellus lectus fringilla massa, sit amet pellentesque velit libero vitae lorem. Pellentesque nec dolor lectus. Fusce scelerisque non ligula tempor pharetra. Curabitur facilisis accumsan interdum. Cras odio odio, consectetur non molestie eget, aliquam imperdiet elit. Nam id egestas mauris. Donec quis justo nec mi vestibulum mollis. Quisque ullamcorper ante sit amet consectetur tincidunt. Donec lacinia blandit est, eu ultricies tellus mollis ut. Suspendisse nec mollis ex.a \ No newline at end of file diff --git a/Section1.html_LOCAL_10440.html b/Section1.html_LOCAL_10440.html new file mode 100644 index 0000000..c029ec7 --- /dev/null +++ b/Section1.html_LOCAL_10440.html @@ -0,0 +1,12 @@ + + + + +

Conflict!

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis porta orci nec lacinia finibus. In hac habitasse platea dictumst. Curabitur blandit bibendum facilisis. Proin consequat pellentesque felis, sit amet tempus eros imperdiet id. Vivamus nulla est, faucibus et rutrum eget, posuere id lectus. Phasellus venenatis pharetra felis, ac ultrices purus dictum eu. Quisque tincidunt neque non lacus facilisis, dignissim rutrum diam tempor. Vestibulum quis sagittis quam, quis dictum sem. Vivamus vulputate aliquet dolor. Cras id lorem ullamcorper, rutrum tellus at, pharetra risus. Donec sollicitudin lectus molestie sem rutrum tincidunt. Sed mollis, mi ut dictum egestas, libero mauris luctus risus, vitae euismod risus felis at augue. Nunc scelerisque tortor eu risus accumsan, at faucibus quam faucibus. Nulla vestibulum viverra facilisis. Donec lacus nunc, luctus sed viverra at, feugiat vitae ante. Nullam nulla magna, cursus eget magna posuere, elementum faucibus eros. +

+ + \ No newline at end of file diff --git a/Section1.html_LOCAL_7432.html b/Section1.html_LOCAL_7432.html new file mode 100644 index 0000000..c029ec7 --- /dev/null +++ b/Section1.html_LOCAL_7432.html @@ -0,0 +1,12 @@ + + + + +

Conflict!

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis porta orci nec lacinia finibus. In hac habitasse platea dictumst. Curabitur blandit bibendum facilisis. Proin consequat pellentesque felis, sit amet tempus eros imperdiet id. Vivamus nulla est, faucibus et rutrum eget, posuere id lectus. Phasellus venenatis pharetra felis, ac ultrices purus dictum eu. Quisque tincidunt neque non lacus facilisis, dignissim rutrum diam tempor. Vestibulum quis sagittis quam, quis dictum sem. Vivamus vulputate aliquet dolor. Cras id lorem ullamcorper, rutrum tellus at, pharetra risus. Donec sollicitudin lectus molestie sem rutrum tincidunt. Sed mollis, mi ut dictum egestas, libero mauris luctus risus, vitae euismod risus felis at augue. Nunc scelerisque tortor eu risus accumsan, at faucibus quam faucibus. Nulla vestibulum viverra facilisis. Donec lacus nunc, luctus sed viverra at, feugiat vitae ante. Nullam nulla magna, cursus eget magna posuere, elementum faucibus eros. +

+ + \ No newline at end of file diff --git a/Section1.html_REMOTE_10440.html b/Section1.html_REMOTE_10440.html new file mode 100644 index 0000000..c0297e2 --- /dev/null +++ b/Section1.html_REMOTE_10440.html @@ -0,0 +1,7 @@ + +

I deleted the first paragraph!

+Ut tellus nisl, congue ac viverra eu, fermentum ut tellus. Donec vitae interdum tellus, eu eleifend ligula. Aliquam porttitor convallis nunc sit amet iaculis. Curabitur sed auctor lorem, et lobortis mi. In ex tortor, ornare sed risus vel, consectetur posuere risus. Nulla vitae sapien ut leo condimentum facilisis sit amet eu metus. Praesent quis magna pretium, sagittis arcu id, maximus ipsum. Pellentesque feugiat quis nunc id efficitur. Praesent vitae maximus nisi, quis porttitor ipsum. Praesent in ornare ex. +Suspendisse tristique convallis nisi, in euismod sapien faucibus sit amet. Sed consectetur felis in orci facilisis scelerisque. Suspendisse dapibus, orci nec sollicitudin rutrum, turpis ipsum vestibulum tellus, a sodales libero ex commodo mauris. Fusce viverra a risus eu imperdiet. Nulla lectus nunc, porta nec nisi in, cursus rutrum elit. Nunc sagittis convallis laoreet. In volutpat, ligula a convallis porta, nisl massa ornare diam, et placerat sem urna sed purus. Fusce eu condimentum leo. Curabitur ornare, urna ac rhoncus pharetra, quam sem cursus odio, vel pharetra dui libero eu nulla. Donec mattis in lacus in sollicitudin. Mauris efficitur nunc et porttitor malesuada. +Donec viverra, lacus nec luctus placerat, tellus lectus fringilla massa, sit amet pellentesque velit libero vitae lorem. Pellentesque nec dolor lectus. Fusce scelerisque non ligula tempor pharetra. Curabitur facilisis accumsan interdum. Cras odio odio, consectetur non molestie eget, aliquam imperdiet elit. Nam id egestas mauris. Donec quis justo nec mi vestibulum mollis. Quisque ullamcorper ante sit amet consectetur tincidunt. Donec lacinia blandit est, eu ultricies tellus mollis ut. Suspendisse nec mollis ex.a \ No newline at end of file diff --git a/Section1.html_REMOTE_7432.html b/Section1.html_REMOTE_7432.html new file mode 100644 index 0000000..c0297e2 --- /dev/null +++ b/Section1.html_REMOTE_7432.html @@ -0,0 +1,7 @@ + +

I deleted the first paragraph!

+Ut tellus nisl, congue ac viverra eu, fermentum ut tellus. Donec vitae interdum tellus, eu eleifend ligula. Aliquam porttitor convallis nunc sit amet iaculis. Curabitur sed auctor lorem, et lobortis mi. In ex tortor, ornare sed risus vel, consectetur posuere risus. Nulla vitae sapien ut leo condimentum facilisis sit amet eu metus. Praesent quis magna pretium, sagittis arcu id, maximus ipsum. Pellentesque feugiat quis nunc id efficitur. Praesent vitae maximus nisi, quis porttitor ipsum. Praesent in ornare ex. +Suspendisse tristique convallis nisi, in euismod sapien faucibus sit amet. Sed consectetur felis in orci facilisis scelerisque. Suspendisse dapibus, orci nec sollicitudin rutrum, turpis ipsum vestibulum tellus, a sodales libero ex commodo mauris. Fusce viverra a risus eu imperdiet. Nulla lectus nunc, porta nec nisi in, cursus rutrum elit. Nunc sagittis convallis laoreet. In volutpat, ligula a convallis porta, nisl massa ornare diam, et placerat sem urna sed purus. Fusce eu condimentum leo. Curabitur ornare, urna ac rhoncus pharetra, quam sem cursus odio, vel pharetra dui libero eu nulla. Donec mattis in lacus in sollicitudin. Mauris efficitur nunc et porttitor malesuada. +Donec viverra, lacus nec luctus placerat, tellus lectus fringilla massa, sit amet pellentesque velit libero vitae lorem. Pellentesque nec dolor lectus. Fusce scelerisque non ligula tempor pharetra. Curabitur facilisis accumsan interdum. Cras odio odio, consectetur non molestie eget, aliquam imperdiet elit. Nam id egestas mauris. Donec quis justo nec mi vestibulum mollis. Quisque ullamcorper ante sit amet consectetur tincidunt. Donec lacinia blandit est, eu ultricies tellus mollis ut. Suspendisse nec mollis ex.a \ No newline at end of file From 71704077886fd2da8e25c4ad7e754269a1984f4c Mon Sep 17 00:00:00 2001 From: Kseniia Epishina Date: Mon, 31 Oct 2016 18:16:16 -0400 Subject: [PATCH 20/31] added link to feature page --- index.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/index.html b/index.html index ee91886..68fdf9d 100644 --- a/index.html +++ b/index.html @@ -4,5 +4,8 @@

My First Heading

My first paragraph. By Kseniia Epishina

+
    +
  1. Featue Page
    2. +
From 779e261945468f84202b00dbe87cf38fc4acf18b Mon Sep 17 00:00:00 2001 From: Kseniia Epishina Date: Mon, 31 Oct 2016 18:20:35 -0400 Subject: [PATCH 21/31] added link to profile page --- index.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/index.html b/index.html index 68fdf9d..4aff846 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,8 @@

My First Heading

By Kseniia Epishina

  1. Featue Page
    2. +
  2. "/kseniiaepishina.html">My Profile
+ From 835a44dd07c8b380ffef9a9ba8cdc79c6308ce39 Mon Sep 17 00:00:00 2001 From: Kseniia Epishina Date: Mon, 31 Oct 2016 16:26:19 -0400 Subject: [PATCH 22/31] created feature php page --- feature.php | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 feature.php diff --git a/feature.php b/feature.php new file mode 100644 index 0000000..804702b --- /dev/null +++ b/feature.php @@ -0,0 +1,4 @@ + \ No newline at end of file From 3eb6b0328523e3cf71b5fdb21e21301882394f20 Mon Sep 17 00:00:00 2001 From: Kseniia Epishina Date: Mon, 31 Oct 2016 18:08:38 -0400 Subject: [PATCH 23/31] added comment to feature page --- feature.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/feature.php b/feature.php index 804702b..c83537d 100644 --- a/feature.php +++ b/feature.php @@ -1,4 +1,6 @@ \ No newline at end of file From 82e1a0cbde2b0c9ab971180533de1a3e7d671a4a Mon Sep 17 00:00:00 2001 From: Kseniia Epishina Date: Mon, 31 Oct 2016 18:11:04 -0400 Subject: [PATCH 24/31] added title to feature page --- feature.php | 1 + 1 file changed, 1 insertion(+) diff --git a/feature.php b/feature.php index c83537d..c29cd15 100644 --- a/feature.php +++ b/feature.php @@ -1,6 +1,7 @@ This is our feature page!" phpinfo(); ?> \ No newline at end of file From da234505feafd2d3d5161d77df27b48f73637d4d Mon Sep 17 00:00:00 2001 From: Kseniia Epishina Date: Wed, 2 Nov 2016 19:38:38 -0400 Subject: [PATCH 25/31] added linkto Suffolk to feature page --- index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/index.html b/index.html index 4aff846..f1569e2 100644 --- a/index.html +++ b/index.html @@ -7,6 +7,7 @@

My First Heading

  1. Featue Page
  2. "/kseniiaepishina.html">My Profile
    3. +
  3. Suffolk
From 1d764f0d2b49106ec1791472df192ddc947581db Mon Sep 17 00:00:00 2001 From: Kseniia Epishina Date: Wed, 2 Nov 2016 19:43:51 -0400 Subject: [PATCH 26/31] edited README.md on master1 --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0c0b744..90d27a3 100644 --- a/README.md +++ b/README.md @@ -2,5 +2,7 @@ Learning example repository for ISOM 424 students. ##Introduction This project enables us to learn source code control using Git. -##Pkurpose -To have code we can use for hands on exercises. \ No newline at end of file +##Purpose +To have code we can use for hands on exercises. +##Conflict on Master +This section will be different on the conflictbranch1. \ No newline at end of file From 1a52cd620307f41206bcedbf4b27da9732deb3de Mon Sep 17 00:00:00 2001 From: Kseniia Epishina Date: Wed, 2 Nov 2016 19:49:39 -0400 Subject: [PATCH 27/31] adding more to README.nd on master1 --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 90d27a3..03bd88b 100644 --- a/README.md +++ b/README.md @@ -5,4 +5,6 @@ This project enables us to learn source code control using Git. ##Purpose To have code we can use for hands on exercises. ##Conflict on Master -This section will be different on the conflictbranch1. \ No newline at end of file +This section will be different on the conflictbranch1. +##Method +How will we resolve this conflict, since the "base" now has a conflict in it? \ No newline at end of file From a513a7984b192879e09510eba0082ffd1277423a Mon Sep 17 00:00:00 2001 From: Kseniia Epishina Date: Wed, 2 Nov 2016 19:46:49 -0400 Subject: [PATCH 28/31] conflict in README.md created on conflictbranch1 --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 03bd88b..89eaf71 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,6 @@ Learning example repository for ISOM 424 students. ##Introduction This project enables us to learn source code control using Git. ##Purpose -To have code we can use for hands on exercises. ##Conflict on Master This section will be different on the conflictbranch1. ##Method From 55193cd232c78cd9ba82c00446d3f834da2ce9ef Mon Sep 17 00:00:00 2001 From: Kseniia Epishina Date: Wed, 2 Nov 2016 20:08:42 -0400 Subject: [PATCH 29/31] edited README.md again on conflictbranch1 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 89eaf71..4e30229 100644 --- a/README.md +++ b/README.md @@ -5,5 +5,5 @@ This project enables us to learn source code control using Git. ##Purpose ##Conflict on Master This section will be different on the conflictbranch1. -##Method -How will we resolve this conflict, since the "base" now has a conflict in it? \ No newline at end of file +##No More Conflicts +We can now merge back in master without any trouble. \ No newline at end of file From fc601e20207db9e4fb3ceab6710e650826290978 Mon Sep 17 00:00:00 2001 From: Kseniia2 Date: Wed, 2 Nov 2016 21:04:44 -0400 Subject: [PATCH 30/31] Added copyright link to the index.html --- index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/index.html b/index.html index f1569e2..5142148 100644 --- a/index.html +++ b/index.html @@ -8,6 +8,7 @@

My First Heading

  • Featue Page
  • "/kseniiaepishina.html">My Profile
  • Suffolk
    • +
  • Copyright Notice
    • From 65f7296c2537fc4f73f1f61060800dd2883c3e29 Mon Sep 17 00:00:00 2001 From: Kseniia Epishina Date: Wed, 2 Nov 2016 21:00:12 -0400 Subject: [PATCH 31/31] adding copyright to local repository --- copyright.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 copyright.md diff --git a/copyright.md b/copyright.md new file mode 100644 index 0000000..787cfde --- /dev/null +++ b/copyright.md @@ -0,0 +1,3 @@ +#Copyright +#GPL v3 +The GNU General Public License (GNU GPL or GPL) is a widely used free software license, which guarantees end users (individuals,organizations, companies) the freedoms to run, study, share (copy), and modu=ify the software. \ No newline at end of file