[GNUnet-SVN] [taler-api] 01/02: Revert accidental bad merge

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository api.

commit 4e79fd492ec1360c34eaeb1d4ba996f7bb65bb6d
Author: Florian Dold <address@hidden>
AuthorDate: Sat Dec 9 12:38:46 2017 +0100

    Revert accidental bad merge
    
    This reverts commit 12447106f6c29ffdb2e5d4ee7fd3abe09a1d117d, reversing
    changes made to fd0e5260107f6c418659808b2620484332afd774.
---
 api-exchange.rst |  4 ++--
 api-merchant.rst | 20 +-------------------
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/api-exchange.rst b/api-exchange.rst
index 507eb56..a4efd43 100644
--- a/api-exchange.rst
+++ b/api-exchange.rst
@@ -911,8 +911,8 @@ the API during normal operation.
       // `kappa - 1` transfer private keys (ephemeral ECDHE keys)
       transfer_privs: EddsaPrivateKey[];
 
-      // transfer public key at the `noreveal_index`.
-      transfer_pub: EddsaPublicKey;
+      // transfer public keys at the `noreveal_index`.
+      transfer_pub: EddsaPublicKey[];
 
       // The original commitment, used to match the /refresh/reveal
       // to the corresponding /refresh/melt operation.
diff --git a/api-merchant.rst b/api-merchant.rst
index 6330f3c..996bbb3 100644
--- a/api-merchant.rst
+++ b/api-merchant.rst
@@ -239,11 +239,6 @@ The following API are made available by the merchant's 
`backend` to the merchant
       // can do order processing without a second lookup on
       // a successful payment
       proposal: Proposal;
-
-      // Refund permissions for the order.  This array will only
-      // be non-empty when this payment is a replay and a refund happened
-      // between the first successful payment request and a refund.
-      refund_permissions: RefundPermission[];
     }
 
 .. http:post:: /refund
@@ -298,25 +293,12 @@ The following API are made available by the merchant's 
`backend` to the merchant
 
   **Response**
 
-  :status 200 OK:
-    Refund loopup was successful. The backend responds with a 
`RefundLookupResponse`_ object.
-    If there were no refunds for a contract, the array of refund permissions 
is empty.
-  :status 404 Not Found:
-    The transaction was not found.  Note that this is *not* the same as
-    there being no refunds for the transaction.
+  If case of success, an *array of* `RefundLookup`_ objects is returned.
 
   .. _RefundLookup:
   .. code-block:: tsref
 
-<<<<<<< HEAD
-    interface RefundLookupResponse {
-      refund_permissions: RefundPermission[];
-    }
-    
-    interface RefundPermission {
-=======
     interface RefundLookup {
->>>>>>> fd0e5260107f6c418659808b2620484332afd774
 
       // Coin from which the refund is going to be taken
       coin_pub: EddsaPublicKey;

-- 
To stop receiving notification emails like this one, please contact
address@hidden