diff --git a/Lib/bsddb/dbobj.py b/Lib/bsddb/dbobj.py
index 961b9e9ef27..0918cc26216 100644
--- 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