From 1b308587b038bb63ea1837121580a69689424243 Mon Sep 17 00:00:00 2001
From: lucasfcosta <fernandesdacostalucas@gmail.com>
Date: Sun, 6 Mar 2016 12:40:40 -0300
Subject: [PATCH] Tests for keys assertion on maps and sets

---
 test/expect.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/expect.js b/test/expect.js
index 3d0be05..01ad355 100644
--- a/test/expect.js
+++ b/test/expect.js
@@ -722,6 +722,7 @@ describe('expect', function () {
     expect({ foo: 1, bar: 2 }).not.contain.all.keys({ 'baz': 8, 'foo': 7 });
 
     if (typeof Map !== 'undefined') {
+<<<<<<< HEAD
       var aKey = {thisIs: 'anExampleObject'};
       var anotherKey = {doingThisBecauseOf: 'referential equality'};