diff --git a/contracts/utils/CHANGELOG.json b/contracts/utils/CHANGELOG.json index d6404d8241..ace3cd5bbb 100644 --- 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