From c6caafb345afd5ec672e53c721e20a3fbf4f08eb Mon Sep 17 00:00:00 2001
From: Doug Black <dblack@twilio.com>
Date: Mon, 27 Jan 2014 10:49:52 -0500
Subject: update README

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

(limited to 'README.md')

diff --git a/README.md b/README.md
index a495a4e..f5075fd 100644
--- a/README.md
+++ b/README.md
@@ -14,10 +14,6 @@ import (
 )
 
 type Item struct {
-<<<<<<< HEAD
-    sleepy.BaseResource
-=======
->>>>>>> da9d8e922d0198a324af1f1b6df97d3e1d5938aa
 }
 
 func (item Item) Get(values url.Values) (int, interface{}) {
-- 
cgit