typo.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@38994 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5Type/patches/unicodeconflictresolver.py

@@ -39,4 +39,4 @@ else:
           error=sys.exc_info())
       result = unicode(text, 'utf-8', 'replace')
     return result
-  PreferredCharsetResolver.resolve = PreferredCharsetResolver_resolv
+  PreferredCharsetResolver.resolve = PreferredCharsetResolver_resolve