diff --git a/docs/mixins/AssetOperations.md b/docs/mixins/AssetOperations.md index 29ec6a0..98d3ca5 100644 --- a/docs/mixins/AssetOperations.md +++ b/docs/mixins/AssetOperations.md @@ -57,11 +57,11 @@ uint256 amount // quantity of collateral to split. Note the collateral and minte ## `_merge` -Opposite of `_mint`. Takes complete sets (equal parts of two complementary outcome tokens) and merges (burns) them by calling the `mergePositions` function on the ctf contract with the provided `conditionId`. Specifically this will convert X complete sets (X of token A (ERC1155) and X of its its complement token A' (ERC1155)) into X units of collateral (ERC20). This function assumes merging happens on a binary set and for the zeroed bytes32 `parentCollectionId`. You can read more about Gnosis Conditional Tokens [here](https://docs.gnosis.io/conditionaltokens/docs/devguide01/). +Opposite of `_mint`. Takes complete sets (equal parts of two complementary outcome tokens) and merges (burns) them by calling the `mergePositions` function on the ctf contract with the provided `conditionId`. Specifically this will convert X complete sets X of token A (ERC1155) and X of its its complement token A' (ERC1155) into X units of collateral (ERC20). This function assumes merging happens on a binary set and for the zeroed bytes32 `parentCollectionId`. You can read more about Gnosis Conditional Tokens [here](https://docs.gnosis.io/conditionaltokens/docs/devguide01/). Parameters: ```java bytes32 conditionId // id of condition on which to merge uint256 amount // quantity of complete sets to burn for their underlying collateral. -``` \ No newline at end of file +```