resolve conflict

mapbox · Jan 11, 2019 · 39b6fd5 · 39b6fd5
2 parents 391be53 + c400bbb
commit 39b6fd5
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/test/unit/ui/map.test.js b/test/unit/ui/map.test.js
@@ -1609,6 +1609,7 @@ test('Map', (t) => {
             });
         });
         t.test('add/remove and remove/add state', (t) => {
+
             const map = createMap(t, {
                 style: {
                     "version": 8,
@@ -1691,6 +1692,7 @@ test('Map', (t) => {
             });
         });
         t.test('fires an error if state property is provided without a feature id', (t) => {
+
             const map = createMap(t, {
                 style: {
                     "version": 8,