Update README.md

krispayne · Feb 14, 2016 · 582f54f · 582f54f
1 parent 4e37b5d
commit 582f54f
Showing 1 changed file with 0 additions and 2 deletions.
diff --git 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.