Commit b9e543c0 authored by Aurel's avatar Aurel

allow syncing from conflict states, remove loop transition on synchronized

parent c49e970c
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
<value> <value>
<tuple> <tuple>
<string>change_to_partial</string> <string>change_to_partial</string>
<string>do_sync</string>
<string>synchronize</string> <string>synchronize</string>
</tuple> </tuple>
</value> </value>
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
<value> <value>
<tuple> <tuple>
<string>change_to_partial</string> <string>change_to_partial</string>
<string>do_sync</string>
<string>synchronize</string> <string>synchronize</string>
</tuple> </tuple>
</value> </value>
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
<tuple> <tuple>
<string>change_to_conflict</string> <string>change_to_conflict</string>
<string>drift</string> <string>drift</string>
<string>synchronize</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
87 88
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment