diff --git a/syncthing-resolve-conflicts b/syncthing-resolve-conflicts index 0e5c252..83c9100 100755 --- a/syncthing-resolve-conflicts +++ b/syncthing-resolve-conflicts @@ -1,7 +1,7 @@ #!/usr/bin/env bash -# Check for sync conflicts and resolve them. Idea from the shell script -# 'pacdiff'. +# Check for sync conflicts and resolve them. Inspired by 'pacdiff' from Arch +# Linux. declare -r myname='syncthing-resolve-conflicts' declare -r myver='1.0.2'