Permalink
Browse files

fixed merge conflict

  • Loading branch information...
2 parents b0c847f + e33ffe2 commit bbc5d125a6138f986cf0213337b30a385172c9f7 @markburns committed Feb 20, 2012
Showing with 6 additions and 1 deletion.
  1. +6 −1 README.md
View
@@ -18,10 +18,15 @@ Or install it yourself as:
## Usage
```ruby
-cat = Word.search 'cat'
+Ldoce::Word.api_key = "<your_key>"
+
+cat = Ldoce::Word.search 'cat'
cat.play #plays mp3 sample - only working for Mac at the moment
cat.definition
#=> "A small four legged animal commonly kept as a pet"
+
+Ldoce::Word.play 'cat'
+#=> <Ldoce::Word: cat "A small four legged animal commonly kept as a pet">
```
## Contributing

0 comments on commit bbc5d12

Please sign in to comment.