Delete merge turd.

bee65017 · Guido van Rossum · cde2eadc · bee65017
Commit bee65017 authored Aug 18, 2006 by Guido van Rossum
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

Lib/bsddb/dbobj.py Lib/bsddb/dbobj.py +0 -1

No files found.
--- 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