perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Files
b5d7ce8ebe197b9c781f890a9f776a0d1bbe1d7b
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