crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge artifact in contracts/exchange/CHANGELOG.json.

Browse Source 
Correct changelog for `contracts/exchange-forwarder` after rebase.
This commit is contained in:
Lawrence Forman
2019-03-26 15:23:05 -04:00
committed by Amir Bandeali
parent db4c29a73c
commit 5b1cbbf157
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/exchange-forwarder/CHANGELOG.json
View File

@@ -88,10 +88,6 @@
{
"note": "Do not reexport external dependencies",
"pr": 1682
},
{
"note": "Update contracts to solidity ^0.5.5 and unpin dependencies",
"pr": 1732
}
],
"timestamp": 1553091633

4
contracts/exchange/CHANGELOG.json
View File

@@ -102,12 +102,8 @@
"pr": 1682
},
{
<<<<<<< HEAD
"note": "Integration testing for ERC1155Proxy",
"pr": 1673
=======
"note": "Use new/cheaper reentrancy guard/mutex"
>>>>>>> 5dd642516... Update changelogs
}
],
"timestamp": 1553091633