From af3593590e3a902334115f07fe0044b52b38157c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <mweinelt@gmail.com>
Date: Fri, 7 Aug 2015 16:00:52 +0200
Subject: [PATCH] fix regression in last commit

---
 scripts/post-merge | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/post-merge b/scripts/post-merge
index 510f455..b2cebf1 100755
--- a/scripts/post-merge
+++ b/scripts/post-merge
@@ -27,7 +27,7 @@ while read HOST; do
   echo "ConnectTo = $HOST" >> $TINCCFG
 done < metanodes
 
-if hash tinc; 2>/dev/null then
+if hash tinc 2>/dev/null; then
     # prefer the command line interface that comes with tinc1.1 if it exists
     tinc -n icvpn reload
 else