From f9676d9add45f692fcebc61702c9fcdad9993ed7 Mon Sep 17 00:00:00 2001
From: Dominik Schrempf <dominik.schrempf@gmail.com>
Date: Wed, 30 May 2018 18:51:25 +0200
Subject: [PATCH] Bump version.

---
 syncthing-resolve-conflicts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/syncthing-resolve-conflicts b/syncthing-resolve-conflicts
index c95b04c..b94166d 100755
--- a/syncthing-resolve-conflicts
+++ b/syncthing-resolve-conflicts
@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 
-# Check for sync conflicts and resolve them.  Idea from the shell
-# script 'pacdiff'.
+# Check for sync conflicts and resolve them. Idea from the shell script
+# 'pacdiff'.
 
 declare -r myname='syncthing-resolve-conflicts'
-declare -r myver='1.0.0'
+declare -r myver='1.0.1'
 
 diffprog=${DIFFPROG:-'vim -d'}
 USE_COLOR='y'