Update CHANGELOGs

2019-03-17 20:01:48 -07:00
parent aea278c022
commit caf286b8cb
12 changed files with 31 additions and 37 deletions
--- a/contracts/coordinator/CHANGELOG.json
+++ b/contracts/coordinator/CHANGELOG.json
@@ -1,6 +1,6 @@
 [
    {
-        "version": "0.0.1",
+        "version": "1.0.0",
        "changes": [
            {
                "note": "Created Coordinator package"
@@ -12,6 +12,18 @@
            {
                "note": "Add `SignatureType.Invalid`",
                "pr": 1705
+            },
+            {
+<<<<<<< HEAD
+                "note": "Add `SignatureType.Invalid`",
+                "pr": 1705
+            },
+            {
+                "note": "Set `evmVersion` to `petersburg`",
+=======
+                "note": "Set `evmVersion` to `constantinople`",
+>>>>>>> 4a3e9e8f4... fgrtre
+                "pr": 1707
            }
        ]
    }