From e6971c45c8b9cb15180630926d4d6800c5dfeeef Mon Sep 17 00:00:00 2001
From: Lawrence <me@merklejerk.com>
Date: Thu, 14 Mar 2019 13:03:00 -0400
Subject: [PATCH] Update PRs in changelogs.

---
 contracts/utils/CHANGELOG.json | 5 +++++
 1 file changed, 5 insertions(+)

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