From 0977a704cdaf037e39555a0a72e3a8951a67f6b8 Mon Sep 17 00:00:00 2001
From: Kevin Thornbloom <kthornbloom@gmail.com>
Date: Wed, 18 Dec 2013 14:40:04 -0500
Subject: [PATCH] Update README.md

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

diff --git a/README.md b/README.md
index 61fe76e..5651284 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,6 @@ http://kthornbloom.com/smoothslides.php
 
 ##Licensing
 Free to use and modify personally or commercially. Not for resale. 
->>>>>>> 843024d0401743e8891429e8b881fcf375ecfbed
 
 ##Help & Feedback
 Connect with me on <a href="https://twitter.com/kthornbloom" target="_blank">twitter.</a>