aboutsummaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorDoug Black <dblack@twilio.com>2014-01-27 10:48:55 -0500
committerDoug Black <dblack@twilio.com>2014-01-27 10:48:55 -0500
commitf0096b9bcb3824acfdc8b8bb729d51eb9d8d75e8 (patch)
treec06915262978dea1bb3a5898c5260373ea5d7823 /README.md
parentuse ServeMux, capitalize API, clean tests (diff)
parentremove the need to provide “missing/unsupported” implementations in the (diff)
downloadsleepy-f0096b9bcb3824acfdc8b8bb729d51eb9d8d75e8.tar.gz
sleepy-f0096b9bcb3824acfdc8b8bb729d51eb9d8d75e8.tar.bz2
sleepy-f0096b9bcb3824acfdc8b8bb729d51eb9d8d75e8.zip
merge #6
Diffstat (limited to 'README.md')
-rw-r--r--README.md6
1 files changed, 4 insertions, 2 deletions
diff --git a/README.md b/README.md
index 138df42..a495a4e 100644
--- a/README.md
+++ b/README.md
@@ -9,11 +9,15 @@ package main
import (
"net/url"
+
"github.com/dougblack/sleepy"
)
type Item struct {
+<<<<<<< HEAD
sleepy.BaseResource
+=======
+>>>>>>> da9d8e922d0198a324af1f1b6df97d3e1d5938aa
}
func (item Item) Get(values url.Values) (int, interface{}) {
@@ -24,13 +28,11 @@ func (item Item) Get(values url.Values) (int, interface{}) {
}
func main() {
-
item := new(Item)
var api = new(sleepy.Api)
api.AddResource(item, "/items")
api.Start(3000)
-
}
```
bgstack15