[Python-3000-checkins] r51350 - python/branches/p3yk/Lib/bsddb/dbobj.py

[guido.van.rossum]

Author: guido.van.rossum
Date: Fri Aug 18 02:44:46 2006
New Revision: 51350

Modified:
   python/branches/p3yk/Lib/bsddb/dbobj.py
Log:
Delete merge turd.


Modified: python/branches/p3yk/Lib/bsddb/dbobj.py
==============================================================================
--- python/branches/p3yk/Lib/bsddb/dbobj.py	(original)
+++ python/branches/p3yk/Lib/bsddb/dbobj.py	Fri Aug 18 02:44:46 2006
@@ -251,4 +251,3 @@
         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