oups, conflict not resolved

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

product/ERP5Form/__init__.py

@@ -40,11 +40,11 @@ document_classes = updateGlobals( this_module, globals(),
                                   permissions_module = Permissions)
 
 # Define object classes and tools
-import Form, FSForm, ListBox, MatrixBox, SelectionTool, ZGDChart, PDFTemplate,\
-       Report, PDFForm, ParallelListField
+import Form, FSForm, ListBox, MatrixBox, SelectionTool, ZGDChart, PDFTemplate, Report, PDFForm, ParallelListField
 import PlanningBox
 import POSBox
 import RelationField, ImageField, MultiRelationField
+import PreferenceTool
 
 from Products.Formulator.FieldRegistry import FieldRegistry
 from Products.Formulator import StandardFields, HelperFields