Conflicts: .gitignore lib/couchrest/model/base.rb lib/couchrest/model/configuration.rb lib/couchrest_model.rb |
||
---|---|---|
.. | ||
attachments | ||
more | ||
views | ||
base.rb |
Conflicts: .gitignore lib/couchrest/model/base.rb lib/couchrest/model/configuration.rb lib/couchrest_model.rb |
||
---|---|---|
.. | ||
attachments | ||
more | ||
views | ||
base.rb |