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

Final Rebase

Browse Source
This commit is contained in:
Noah Khamliche 2021-09-01 14:26:42 -04:00 committed by Noah Khamliche
parent 317f2138c5
commit 7439871aa0
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contracts/utils/CHANGELOG.json
View File

@ -1,13 +1,8 @@
[ [
{ {
"version": "4.8.0", "version": "4.8.0",
<<<<<<< HEAD
"changes": [ "changes": [
{ {
<<<<<<< HEAD
"note" : "Added FundRecoveryFeature to the 0x EP",
"pr" : 306
=======
"note": "Added FundRecoveryFeature to the 0x EP", "note": "Added FundRecoveryFeature to the 0x EP",
"pr": 306 "pr": 306
} }
@ -19,13 +14,6 @@
"changes": [ "changes": [
{ {
"note": "Dependencies updated" "note": "Dependencies updated"
>>>>>>> 154f30848 ( fixed json)
=======
"changes":[
{
"note" : "Added FundRecoveryFeature to the 0x EP",
"pr" : 306
>>>>>>> 00e6b974a ( fixed json)
} }
] ]
}, },