Update PRs in changelogs.

2019-03-14 13:03:00 -04:00 · 2019-03-14 13:03:00 -04:00 · e6971c45c8
commit e6971c45c8
parent 961cd0825c
1 changed files with 5 additions and 0 deletions
--- a/contracts/utils/CHANGELOG.json
+++ b/contracts/utils/CHANGELOG.json
@ -106,12 +106,17 @@
                "pr": 1657
            },
            {
+<<<<<<< HEAD
                "note": "Add unit tests for `LibAddressArray`",
                "pr": 1712
            },
            {
                "note": "Fix `LibAddressArray.indexOf` returning incorrect index.",
                "pr": 1712
+=======
+                "note": "Change ReentrancyGuard implementation to cheaper one",
+                "pr": 1699
+>>>>>>> Update PRs in changelogs.
            }
        ],
        "timestamp": 1553091633