fix conflict markers...

2009-01-12 21:42:31 -08:00 · 2009-01-12 21:42:31 -08:00 · 7d6f3e0ced
parent b632b0fdf0
commit 7d6f3e0ced
1 changed files with 0 additions and 3 deletions
--- a/lib/couchrest/core/model.rb
+++ b/lib/couchrest/core/model.rb
@ -1,12 +1,9 @@
 require 'rubygems'
 require 'extlib'
 require 'digest/md5'
-<<<<<<< HEAD:lib/couchrest/core/model.rb
 require File.dirname(__FILE__) + '/document'
-=======
 require 'mime/types'

->>>>>>> CRUD for attachments in CouchRest::Model instance:lib/couchrest/core/model.rb
 # = CouchRest::Model - ORM, the CouchDB way
 module CouchRest
  # = CouchRest::Model - ORM, the CouchDB way