[GNUnet-SVN] [taler-api] branch master updated (1244710 -> a1d5626)

[gnunet]

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

dold pushed a change to branch master
in repository api.

    from 1244710  fix typo
     new 4e79fd4  Revert accidental bad merge
     new a1d5626  fix typo / type error in refresh API

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 api-merchant.rst | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

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