summaryrefslogtreecommitdiff
path: root/src/backend/taler-merchant-httpd.h
diff options
context:
space:
mode:
authorMarcello Stanisci <marcello.stanisci@inria.fr>2016-06-25 14:33:58 +0200
committerMarcello Stanisci <marcello.stanisci@inria.fr>2016-06-25 14:33:58 +0200
commit3421048ed589e7230307028f1949937413b343fc (patch)
tree0a1e11e33eab839c0915d3ad203dd8f930747877 /src/backend/taler-merchant-httpd.h
parenta99831004017312d7c85044b94753b4f67194cc7 (diff)
parentc6594dbde03327e984773bf40a84c6751531736b (diff)
downloadmerchant-3421048ed589e7230307028f1949937413b343fc.tar.gz
merchant-3421048ed589e7230307028f1949937413b343fc.tar.bz2
merchant-3421048ed589e7230307028f1949937413b343fc.zip
Merge branch '4540' of ssh://taler.net/var/git/merchant into 4540
Diffstat (limited to 'src/backend/taler-merchant-httpd.h')
-rw-r--r--src/backend/taler-merchant-httpd.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backend/taler-merchant-httpd.h b/src/backend/taler-merchant-httpd.h
index 060fd26e..ffb075ac 100644
--- a/src/backend/taler-merchant-httpd.h
+++ b/src/backend/taler-merchant-httpd.h
@@ -81,7 +81,7 @@ struct MerchantInstance {
* the configuration is kept in memory, as it's as substring of
* a section name
*/
- const char *id;
+ char *id;
/**
* File holding the merchant's private key