Conflicts: gui/scripts/syncthing/core/controllers/syncthingController.js internal/auto/gui.files.go |
||
---|---|---|
.. | ||
auto_test.go | ||
doc.go | ||
gui.files.go |
Conflicts: gui/scripts/syncthing/core/controllers/syncthingController.js internal/auto/gui.files.go |
||
---|---|---|
.. | ||
auto_test.go | ||
doc.go | ||
gui.files.go |