Fixed conflict

2008-12-08 13:34:37 -07:00 · 2008-12-08 13:34:37 -07:00 · c3858d6fb6
commit c3858d6fb6
parent 366668679e
1 changed files with 0 additions and 4 deletions
--- a/lib/mongo/collection.rb
+++ b/lib/mongo/collection.rb
@ -36,11 +36,7 @@ module XGen
          res = @db.insert_into_db(@name, objects)
          res.size > 1 ? res : res.first
        end
-<<<<<<< HEAD:lib/mongo/collection.rb
-        alias :<< :insert
-=======
        alias_method :<<, :insert
->>>>>>> e7019a63f28331913c12e5c145d1f49af10b54ac:lib/mongo/collection.rb

        def remove(selector={})
          @db.remove_from_db(@name, selector)