Commit 29486319 authored by Aurel's avatar Aurel

allow to go from syncing to conflict state

parent 78cb52bc
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
<key> <string>transitions</string> </key> <key> <string>transitions</string> </key>
<value> <value>
<tuple> <tuple>
<string>change_to_conflict</string>
<string>synchronize</string> <string>synchronize</string>
</tuple> </tuple>
</value> </value>
......
86 87
\ 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