deac/couchrest_model
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixing wrong merge

Browse source
This commit is contained in:
Tapajós 2009-09-03 23:35:05 -03:00
parent 8c8ede012c
commit 9a5ac84737
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -141,7 +141,6 @@ you can define some casting rules.
property :occurs_at, :cast_as => 'Time' property :occurs_at, :cast_as => 'Time'
property :end_date, :cast_as => 'Date' property :end_date, :cast_as => 'Date'
<<<<<<< HEAD
If you want to cast an array of instances from a specific Class, use the trick shown above ["ClassName"] If you want to cast an array of instances from a specific Class, use the trick shown above ["ClassName"]
### Pagination ### Pagination
@ -173,6 +172,3 @@ Low level usage:
CouchRest is compatible with rails and can even be used a Rails plugin. CouchRest is compatible with rails and can even be used a Rails plugin.
However, you might be interested in the CouchRest companion rails project: However, you might be interested in the CouchRest companion rails project:
[http://github.com/hpoydar/couchrest-rails](http://github.com/hpoydar/couchrest-rails) [http://github.com/hpoydar/couchrest-rails](http://github.com/hpoydar/couchrest-rails)
=======
If you want to cast an array of instances from a specific Class, use the trick shown above ["ClassName"]
>>>>>>> remotes/old/master