Update yuidoc annotations

LiskArchive · Jul 18, 2017 · 8bd26ba · 8bd26ba
1 parent 9b8adc7
commit 8bd26ba
Showing 1 changed file with 18 additions and 0 deletions.
diff --git a/lib/transactions/transfer.js b/lib/transactions/transfer.js
@@ -23,9 +23,14 @@ var slots       = require('../time/slots.js');
 
 /**
  * @method createInTransfer
+ * @param dappId
+ * @param amount
  * @param secret
  * @param secondSecret
+<<<<<<< HEAD
  * @param dappId
+=======
+>>>>>>> Update yuidoc annotations
  * @param timeOffset
  *
  * @return {Object}
@@ -61,6 +66,19 @@ function createInTransfer (dappId, amount, secret, secondSecret, timeOffset) {
 	return transaction;
 }
 
+/**
+ * @method createOutTransfer
+ * @param dappId
+ * @param transactionId
+ * @param recipientId
+ * @param amount
+ * @param secret
+ * @param secondSecret
+ * @param timeOffset
+ *
+ * @return {Object}
+ */
+
 function createOutTransfer (dappId, transactionId, recipientId, amount, secret, secondSecret, timeOffset) {
 	var now = new Date().getTime();
 	var time = timeOffset ? now - timeOffset : now;