summaryrefslogtreecommitdiffstats
path: root/Lib/bsddb/dbobj.py
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/bsddb/dbobj.py')
-rw-r--r--Lib/bsddb/dbobj.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/Lib/bsddb/dbobj.py b/Lib/bsddb/dbobj.py
index 961b9e9..0918cc2 100644
--- a/Lib/bsddb/dbobj.py
+++ b/Lib/bsddb/dbobj.py
@@ -251,4 +251,3 @@ class DBSequence:
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