Update PRs in changelogs.

This commit is contained in:
Lawrence 2019-03-14 13:03:00 -04:00 committed by Amir Bandeali
parent 961cd0825c
commit e6971c45c8

View File

@ -106,12 +106,17 @@
"pr": 1657 "pr": 1657
}, },
{ {
<<<<<<< HEAD
"note": "Add unit tests for `LibAddressArray`", "note": "Add unit tests for `LibAddressArray`",
"pr": 1712 "pr": 1712
}, },
{ {
"note": "Fix `LibAddressArray.indexOf` returning incorrect index.", "note": "Fix `LibAddressArray.indexOf` returning incorrect index.",
"pr": 1712 "pr": 1712
=======
"note": "Change ReentrancyGuard implementation to cheaper one",
"pr": 1699
>>>>>>> Update PRs in changelogs.
} }
], ],
"timestamp": 1553091633 "timestamp": 1553091633