From e1822eab7a8adb2318420b1a9daf289910a9278e Mon Sep 17 00:00:00 2001
From: Marcello Stanisci <marcello.stanisci@inria.fr>
Date: Mon, 24 Oct 2016 17:42:27 +0200
Subject: fix comment

---
 api-merchant.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api-merchant.rst b/api-merchant.rst
index b44d52ca..d9488493 100644
--- a/api-merchant.rst
+++ b/api-merchant.rst
@@ -252,7 +252,7 @@ The following API are made available by the merchant's `backend` to the merchant
   .. code-block:: tsref
 
     interface TransactionConflictProof {
-      // A claim by the exchange about the transfers associated
+      // A claim by the exchange about the transactions associated
       // with a given wire transfer; it does not list the
       // transaction that `transaction_tracking_claim` says is part
       // of the aggregate.  This is
-- 
cgit v1.2.3