aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Black <dblack@twilio.com>2014-01-27 10:49:52 -0500
committerDoug Black <dblack@twilio.com>2014-01-27 10:49:52 -0500
commitc6caafb345afd5ec672e53c721e20a3fbf4f08eb (patch)
tree895edc22a6fb3719e8d534e1a21d8167b8f8b23d
parentupdate AUTHORS.md (diff)
downloadsleepy-c6caafb345afd5ec672e53c721e20a3fbf4f08eb.tar.gz
sleepy-c6caafb345afd5ec672e53c721e20a3fbf4f08eb.tar.bz2
sleepy-c6caafb345afd5ec672e53c721e20a3fbf4f08eb.zip
update README
-rw-r--r--README.md4
1 files changed, 0 insertions, 4 deletions
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{}) {
bgstack15