github-migration
/
mongo-ruby-driver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed conflict

This commit is contained in:
Adrian Madrid 2008-12-08 13:34:37 -07:00
parent 366668679e
commit c3858d6fb6
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/mongo/collection.rb
View File

@ -36,11 +36,7 @@ module XGen
res = @db.insert_into_db(@name, objects) res = @db.insert_into_db(@name, objects)
res.size > 1 ? res : res.first res.size > 1 ? res : res.first
end end
<<<<<<< HEAD:lib/mongo/collection.rb
alias :<< :insert
=======
alias_method :<<, :insert alias_method :<<, :insert
>>>>>>> e7019a63f28331913c12e5c145d1f49af10b54ac:lib/mongo/collection.rb
def remove(selector={}) def remove(selector={})
@db.remove_from_db(@name, selector) @db.remove_from_db(@name, selector)