From a35dd5cc569a20afad403fea29bd5dadb99c767f Mon Sep 17 00:00:00 2001
From: Ansis Brammanis <ansis@mapbox.com>
Date: Wed, 7 Aug 2019 15:35:00 -0400
Subject: [PATCH] fix small things that broke during rebase

---
 src/style/style_layer/symbol_style_layer.js      | 2 --
 test/unit/symbol/format_section_override.test.js | 2 +-
 test/unit/symbol/symbol_style_layer.test.js      | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/style/style_layer/symbol_style_layer.js b/src/style/style_layer/symbol_style_layer.js
index f15d1d388a3..c1abf747a60 100644
--- a/src/style/style_layer/symbol_style_layer.js
+++ b/src/style/style_layer/symbol_style_layer.js
@@ -5,8 +5,6 @@ import StyleLayer from '../style_layer';
 import assert from 'assert';
 import SymbolBucket from '../../data/bucket/symbol_bucket';
 import resolveTokens from '../../util/resolve_tokens';
-import { isExpression } from '../../style-spec/expression';
-import assert from 'assert';
 import properties from './symbol_style_layer_properties';
 
 import {
diff --git a/test/unit/symbol/format_section_override.test.js b/test/unit/symbol/format_section_override.test.js
index a6333b279cd..be428f96b6e 100644
--- a/test/unit/symbol/format_section_override.test.js
+++ b/test/unit/symbol/format_section_override.test.js
@@ -1,4 +1,4 @@
-import { test } from 'mapbox-gl-js-test';
+import { test } from '../../util/test';
 import { createExpression, ZoomConstantExpression } from '../../../src/style-spec/expression';
 import EvaluationContext from '../../../src/style-spec/expression/evaluation_context';
 import properties from '../../../src/style/style_layer/symbol_style_layer_properties';
diff --git a/test/unit/symbol/symbol_style_layer.test.js b/test/unit/symbol/symbol_style_layer.test.js
index 4958b218b83..5e1a8538917 100644
--- a/test/unit/symbol/symbol_style_layer.test.js
+++ b/test/unit/symbol/symbol_style_layer.test.js
@@ -1,4 +1,4 @@
-import { test } from 'mapbox-gl-js-test';
+import { test } from '../../util/test';
 import SymbolStyleLayer from '../../../src/style/style_layer/symbol_style_layer';
 import FormatSectionOverride from '../../../src/style-spec/expression/definitions/format_section_override';
 import properties from '../../../src/style/style_layer/symbol_style_layer_properties';