From b63aa983978750c304ce8c2d87649b3fa2339b08 Mon Sep 17 00:00:00 2001
From: Florian Dold <dold@inria.fr>
Date: Sat, 19 Dec 2015 21:14:20 +0100
Subject: Remove legacy config file.

---
 contrib/merchant.conf | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 contrib/merchant.conf

(limited to 'contrib')

diff --git a/contrib/merchant.conf b/contrib/merchant.conf
deleted file mode 100644
index e1727b4f..00000000
--- a/contrib/merchant.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[merchant]
-PORT = 4251
-
-# List of mints the merchant trusts delimited by a single space
-TRUSTED_MINTS = taler
-
-[mint-taler]
-HOSTNAME = taler.org
-PORT = 4241
-# The public key of this mint
-PUBKEY = ...
-
-[merchant-db]
-CONFIG = postgres:///taler
\ No newline at end of file
-- 
cgit v1.2.3