From 582f54ffa04eef6b74dab506204cece77aa2b756 Mon Sep 17 00:00:00 2001
From: Kris Payne <krispayne@me.com>
Date: Sat, 13 Feb 2016 16:18:41 -0800
Subject: [PATCH] Update README.md

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 197d6c2..a497922 100644
--- a/README.md
+++ b/README.md
@@ -9,11 +9,9 @@ Several lines do not work and have been commented out. Certain one's will hose a
 
 **Use at your own risk, please. There may be dragons.**
 
-<<<<<<< HEAD
 10.9 Mavericks file is mostly ready, but not very pretty. Based off 1.0 benchmarks
 =======
 10.9 Mavericks dotfile is mostly ready, but not very pretty. Based off 1.0 benchmarks
->>>>>>> master
 
 10.10 Yosemite is being updated to match 1.0 benchmarks. Currently based off a beta of 1.0.