diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2015-11-05 17:56:12 +0100 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2015-11-05 17:56:12 +0100 |
| commit | c1159ff547afffd135cde78c026dd35817d2f927 (patch) | |
| tree | 9d0126a494b7018d4ad70e2c7d21de75ca6c3e8f /src/backend/melted/merchant.conf | |
| parent | 45cd6f3e16d8411add89588673cd58873293c2b0 (diff) | |
| parent | e55860d9139702f39ce2b61df5bb0e33e1f30a08 (diff) | |
| download | merchant-c1159ff547afffd135cde78c026dd35817d2f927.tar.gz merchant-c1159ff547afffd135cde78c026dd35817d2f927.tar.bz2 merchant-c1159ff547afffd135cde78c026dd35817d2f927.zip | |
Merge branch 'fix4013'
Conflicts:
src/frontend/index.html
Diffstat (limited to 'src/backend/melted/merchant.conf')
| -rw-r--r-- | src/backend/melted/merchant.conf | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/backend/melted/merchant.conf b/src/backend/melted/merchant.conf deleted file mode 100644 index 3b637448..00000000 --- a/src/backend/melted/merchant.conf +++ /dev/null @@ -1,18 +0,0 @@ -[merchant] -PORT = 9966 -HOSTNAME = localhost -TRUSTED_MINTS = taler -KEYFILE = merchant.priv - -[mint-taler] -HOSTNAME = demo.taler.net -PORT = 80 -PUBKEY = Q1WVGRGC1F4W7RYC6M23AEGFEXQEHQ730K3GG0B67VPHQSRR75H0 - -[merchant-db] -CONFIG = postgres:///taler - -[wire-sepa] -IBAN = DE67830654080004822650 -NAME = GNUNET E.V -BIC = GENODEF1SRL |