From 4b65bf283ced2cad2034b7c5819cd5c7744b6e3e Mon Sep 17 00:00:00 2001
From: Bex Warner <bexmwarner@gmail.com>
Date: Tue, 16 Oct 2018 16:20:46 -0400
Subject: [PATCH] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6bbf5c1..3ebee22 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<<<<<<< HEAD
+
 # testing-things
 hhh
 =======