From 7ea090ea0f91bc55a99ee1574a5e0844c75ef4df Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Tue, 21 Feb 2017 10:06:06 +0100
Subject: Follow move of catlfish source.

---
 catlfish-dev/merge.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/catlfish-dev/merge.sh b/catlfish-dev/merge.sh
index a571b63..26e6c72 100755
--- a/catlfish-dev/merge.sh
+++ b/catlfish-dev/merge.sh
@@ -23,8 +23,8 @@ sleep $S1
 while true; do
     echo "$0: merging"
     date
-    /usr/local/src/catlfish/tools/merge \
-        --config /usr/local/etc/catlfish/${LOGNAME}.cfg \
+    /usr/local/catlfish/src/tools/merge \
+        --config ${LOGNAME}.cfg \
         --localconfig /usr/local/etc/catlfish/${NODENAME}.cfg \
         ${MERGE_EXTRA_ARGS}
     date
-- 
cgit v1.1