From 5f7907a9056243115604d989673af3db51d2e95d Mon Sep 17 00:00:00 2001 From: Dan Zabinski Date: Sat, 28 May 2016 12:52:40 -0500 Subject: [PATCH] #6 attempt to create a conflict DZ is attempting to create some conflict with the code and look at what will be the result. issue #6 --- Goodbuy.html | 12 ++++++++++++ Hello.html => Hello.html.bak5282016 | 0 2 files changed, 12 insertions(+) create mode 100644 Goodbuy.html rename Hello.html => Hello.html.bak5282016 (100%) diff --git a/Goodbuy.html b/Goodbuy.html new file mode 100644 index 0000000..dc2fda8 --- /dev/null +++ b/Goodbuy.html @@ -0,0 +1,12 @@ +Hello World + +Hello World +
+TEST + +
+Osprey spotted on branch eating sushi + +
+
+ \ No newline at end of file diff --git a/Hello.html b/Hello.html.bak5282016 similarity index 100% rename from Hello.html rename to Hello.html.bak5282016