Fix r2015: it mistakenly replaced the whole dict by a serial.

git-svn-id: https://svn.erp5.org/repos/neo/trunk@2016 71dcc9de-d417-0410-9af5-da40c76e7ee4

neo/client/app.py

@@ -608,7 +608,7 @@ class Application(object):
                     data)
                 if new_data is not None:
                     # Mark this conflict as resolved
-                    local_var.resolved_conflict_serial_dict = \
+                    local_var.resolved_conflict_serial_dict[oid] = \
                         local_var.conflict_serial_dict.pop(oid)
                     # Try to store again
                     self.store(oid, conflict_serial, new_data, version,