+ ‘.sparkleshare’
/ ‘host/master/Bmode/dic00_system.txt’
/ ‘host/master/Bmode/dic01_Base.txt’
/ ‘host/master/Bmode/dic02_Event.txt’
/ ‘host/master/Bmode/dic03_Touch.txt’
/ ‘host/master/Bmode/dic04_Time.txt’
/ ‘host/master/Bmode/dic05_Name.txt’
/ ‘host/master/Bmode/dic06_String.txt’
/ ‘host/master/Bmode/dic07_Order.txt’
/ ‘host/master/Bmode/dic07_Order2.txt’
...
Conflict resolution by SparkleShare