From bee65017df8a8c1aa09cd1475fac1d6d3de61174 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Fri, 18 Aug 2006 00:44:46 +0000
Subject: Delete merge turd.

---
 Lib/bsddb/dbobj.py | 1 -
 1 file changed, 1 deletion(-)

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
-- 
cgit v0.12