diff options
| author | Guido van Rossum <guido@python.org> | 2006-08-18 00:44:46 +0000 | 
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2006-08-18 00:44:46 +0000 | 
| commit | bee65017df8a8c1aa09cd1475fac1d6d3de61174 (patch) | |
| tree | a52c12bf198b2fcc59de1378ffac5e248f9b6ed1 | |
| parent | cde2eadcf46c4cc993d18c8de7121bbb952a1372 (diff) | |
| download | cpython-git-bee65017df8a8c1aa09cd1475fac1d6d3de61174.tar.gz | |
Delete merge turd.
| -rw-r--r-- | Lib/bsddb/dbobj.py | 1 | 
1 files changed, 0 insertions, 1 deletions
diff --git a/Lib/bsddb/dbobj.py b/Lib/bsddb/dbobj.py index 961b9e9ef2..0918cc2621 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  | 
