Edit circleci config to omit tests we aren't interested in for 3.0

2019-03-26 12:21:52 -04:00
parent fd68746dd7
commit 4f82c0c289
2 changed files with 199 additions and 32 deletions
--- a/contracts/utils/CHANGELOG.json
+++ b/contracts/utils/CHANGELOG.json
@@ -106,17 +106,12 @@
                "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