From 5c801ecc18035150155915d298569cf655b6c081 Mon Sep 17 00:00:00 2001
From: Gintautas Miliauskas <gintas@pov.lt>
Date: Sat, 17 Apr 2004 22:46:18 +0000
Subject: [PATCH] Removed trailing whitespace.

---
 src/ZODB/ConflictResolution.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ZODB/ConflictResolution.py b/src/ZODB/ConflictResolution.py
index 1a696140..808ea2ef 100644
--- a/src/ZODB/ConflictResolution.py
+++ b/src/ZODB/ConflictResolution.py
@@ -87,7 +87,7 @@ def persistent_id(object):
     if getattr(object, '__class__', 0) is not PersistentReference:
         return None
     return object.data
-    
+
 _unresolvable = {}
 def tryToResolveConflict(self, oid, committedSerial, oldSerial, newpickle,
                          committedData=''):
@@ -107,7 +107,7 @@ def tryToResolveConflict(self, oid, committedSerial, oldSerial, newpickle,
         else:
             klass = meta
             newargs = ()
-            
+
         if klass in _unresolvable:
             return None
 
-- 
2.30.9