From dfe92cbbf33a82a234cc721d26899cf65ece47a2 Mon Sep 17 00:00:00 2001
From: MickeyKay <mickeyskay@gmail.com>
Date: Mon, 11 May 2015 17:16:18 -0700
Subject: [PATCH] Fix merge conflict.

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

diff --git a/README.md b/README.md
index d6e0fe9..ad32374 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,5 @@
 Trestle
-<<<<<<< HEAD
 ---------------------
-=======
-=======
->>>>>>> dev
 
 ### A handy boilerplate child theme for serious Genesis developers.
 [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/MickeyKay/trestle?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)