[Zope3-checkins] CVS: Zope3/src/ZODB - ConflictResolution.py:1.24

[Gintautas Miliauskas]

Update of /cvs-repository/Zope3/src/ZODB
In directory cvs.zope.org:/tmp/cvs-serv19426/src/ZODB

Modified Files:
	ConflictResolution.py 
Log Message:
Removed trailing whitespace.


=== Zope3/src/ZODB/ConflictResolution.py 1.23 => 1.24 ===
--- Zope3/src/ZODB/ConflictResolution.py:1.23	Sat Apr 17 18:45:28 2004
+++ Zope3/src/ZODB/ConflictResolution.py	Sat Apr 17 18:46:18 2004
@@ -87,7 +87,7 @@
     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 @@
         else:
             klass = meta
             newargs = ()
-            
+
         if klass in _unresolvable:
             return None