From bce0463f8e1292a4590cb2e7d3a7a1bfebed79f8 Mon Sep 17 00:00:00 2001
From: ElementG9 <elementg9dev@gmail.com>
Date: Sat, 12 Jan 2019 21:13:38 -0700
Subject: [PATCH] Fix weird stuff in readme.md.

---
 readme.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/readme.md b/readme.md
index 15c717b..6677949 100644
--- a/readme.md
+++ b/readme.md
@@ -12,11 +12,8 @@ Pivot is a new programming language built on [JavaScript][javascript-site] by [E
 ---
 
 ### Documentation
-<<<<<<< HEAD
+
 The Pivot documentation is at [gthub.us/pivot/docs][pivot-docs].
-=======
-The Pivot documentation is at [gthub.us/pivot/docs][pivot-docs]
->>>>>>> 5b5a7d16d47a4b3962ef8338f439a4e880d8a0cb
 
 [elementg9-user]: https://github.com/ElementG9/
 [pivot-site]: https://gthub.us/pivot/