From c3858d6fb60f72539213cf4c1c7646ebdc9ba5ee Mon Sep 17 00:00:00 2001
From: Adrian Madrid <aem@aemtower.(none)>
Date: Mon, 8 Dec 2008 13:34:37 -0700
Subject: [PATCH] Fixed conflict

---
 lib/mongo/collection.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/mongo/collection.rb b/lib/mongo/collection.rb
index 2b31bdb..91181f5 100644
--- 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)