From: Guido van Rossum <guido@python.org>
Date: Fri, 18 Aug 2006 00:44:46 +0000 (+0000)
Subject: Delete merge turd.
X-Git-Tag: v3.0a1~1392
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bee65017df8a8c1aa09cd1475fac1d6d3de61174;p=python

Delete merge turd.
---

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