allow syncing from conflict states, remove loop transition on synchronized

bt5/erp5_syncml/WorkflowTemplateItem/portal_workflow/syncml_signature_validation_workflow/states/conflict_resolved_with_client_command_winning.xml

@@ -23,6 +23,7 @@
             <value>
               <tuple>
                 <string>change_to_partial</string>
+                <string>do_sync</string>
                 <string>synchronize</string>
               </tuple>
             </value>

bt5/erp5_syncml/WorkflowTemplateItem/portal_workflow/syncml_signature_validation_workflow/states/conflict_resolved_with_merge.xml

@@ -23,6 +23,7 @@
             <value>
               <tuple>
                 <string>change_to_partial</string>
+                <string>do_sync</string>
                 <string>synchronize</string>
               </tuple>
             </value>

bt5/erp5_syncml/WorkflowTemplateItem/portal_workflow/syncml_signature_validation_workflow/states/synchronized.xml

@@ -24,7 +24,6 @@
               <tuple>
                 <string>change_to_conflict</string>
                 <string>drift</string>
-                <string>synchronize</string>
               </tuple>
             </value>
         </item>

bt5/erp5_syncml/bt/revision

-87
\ No newline at end of file
+88
\ No newline at end of file