perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Files
55e434d67a5f846bfc21c9cc57a06701f453c011
syncthing-arm/internal/model/rwfolder.go
Audrius Butkevicius 5fe15475a4 Merge pull request #1540 from calmh/conflicts 
Handle conflicts when pulling (fixes #220)
2015-03-30 21:20:23 +01:00

31 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink