Delete merge turd.

gvanrossum · gvanrossum · commit bee65017df8a · 2006-08-18T00:44:46.000Z
diff --git a/Lib/bsddb/dbobj.py b/Lib/bsddb/dbobj.py
@@ -251,4 +251,3 @@ def get_flags(self, *args, **kwargs):
         return apply(self._cobj.get_flags, args, kwargs)
     def get_range(self, *args, **kwargs):
         return apply(self._cobj.get_range, args, kwargs)
->>>>>>> .merge-right.r46752
