conflict solved

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

product/ERP5/Document/TransformationRule.py

@@ -191,7 +191,7 @@ An ERP5 Rule..."""
       production_section = my_context_movement.getSourceSection()
       # Generate production and consumption lines
       my_quantity = my_context_movement.getTargetQuantity()
-      # LOG('Transformation', 0, str(my_transformation))
+      #LOG('Transformation', 0, str(my_transformation))
       # We used to call this with context = my_context_movement
       # but it still has some issue which need to be fixed XXX As
       # a temp solution, we use the dict based API, but it is not general enough
@@ -330,4 +330,4 @@ An ERP5 Rule..."""
     def getSolverList(self, applied_rule):
       """
         Returns a list Divergence solvers
-      """
\ No newline at end of file
+      """