feat: fixed json

2021-09-01 14:09:02 -04:00
parent e5834f1901
commit 317f2138c5
1 changed files with 7 additions and 0 deletions
--- a/contracts/utils/CHANGELOG.json
+++ b/contracts/utils/CHANGELOG.json
@@ -1,6 +1,7 @@
 [
    {
        "version": "4.8.0",
+<<<<<<< HEAD
        "changes": [
            {
 <<<<<<< HEAD
@@ -19,6 +20,12 @@
            {
                "note": "Dependencies updated"
 >>>>>>> 154f30848 ( fixed json)
+=======
+        "changes":[
+            {
+                "note" : "Added FundRecoveryFeature to the 0x EP",
+                "pr" : 306
+>>>>>>> 00e6b974a ( fixed json)
            }
        ]
    },