From c85d1a96bcdcfec34b597392472125e2bf41b541 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Thu, 31 Aug 2017 20:56:59 +0200
Subject: Remove spurious MERGE_DB_DIR setting.

The same thing is done in merge.sh.
---
 catlfish-dev/start.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/catlfish-dev/start.sh b/catlfish-dev/start.sh
index e651fae..8b3d04a 100755
--- a/catlfish-dev/start.sh
+++ b/catlfish-dev/start.sh
@@ -26,7 +26,6 @@ case $role in
         ;;
 
     merge)
-	[ -z "${MERGE_DB_DIR}" ] && MERGE_DB_DIR=merge-db
         $erlbase/merge.sh ${logname} ${nodename} \
                           > merge_log/stdout \
                           2> merge_log/stderr &
-- 
cgit v1.1