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

fix conflict markers...

Browse source
This commit is contained in:
Chris Anderson 2009-01-12 21:42:31 -08:00
parent b632b0fdf0
commit 7d6f3e0ced
1 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/couchrest/core/model.rb
View file

@ -1,12 +1,9 @@
require 'rubygems' require 'rubygems'
require 'extlib' require 'extlib'
require 'digest/md5' require 'digest/md5'
<<<<<<< HEAD:lib/couchrest/core/model.rb
require File.dirname(__FILE__) + '/document' require File.dirname(__FILE__) + '/document'
=======
require 'mime/types' require 'mime/types'
>>>>>>> CRUD for attachments in CouchRest::Model instance:lib/couchrest/core/model.rb
# = CouchRest::Model - ORM, the CouchDB way # = CouchRest::Model - ORM, the CouchDB way
module CouchRest module CouchRest
# = CouchRest::Model - ORM, the CouchDB way # = CouchRest::Model - ORM, the CouchDB way