From a95c21fca0cf32659c24a0d8b632d5cb00a54d59 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Tue, 1 Mar 2016 18:07:30 +0100
Subject: config location

---
 taler-arm/taler-merchant.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'taler-arm/taler-merchant.conf')

diff --git a/taler-arm/taler-merchant.conf b/taler-arm/taler-merchant.conf
index 3b0c91f..3f93cf1 100644
--- a/taler-arm/taler-merchant.conf
+++ b/taler-arm/taler-merchant.conf
@@ -1,4 +1,4 @@
 [taler-merchant]
 TYPE = simple
 BINARY = taler-merchant-httpd
-OPTIONS = -t -c $HOME/merchant.conf
+OPTIONS = -t -c $HOME/config/merchant.conf
-- 
cgit v1.2.3