1 files changed, 8 insertions, 0 deletions
diff --git a/README.md b/README.md
index 97c01ce..a495a4e 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,10 @@ import (
 )
 
 type Item struct {
+<<<<<<< HEAD
+    sleepy.BaseResource
+=======
+>>>>>>> da9d8e922d0198a324af1f1b6df97d3e1d5938aa
 }
 
 func (item Item) Get(values url.Values) (int, interface{}) {
@@ -40,3 +44,7 @@ curl localhost:3000/items
 ```
 
 Stay tuned.
+
+## License
+
+Sleepy is released under the [MIT License](http://opensource.org/licenses/MIT).