From 0b5daae37be0310dc626cf96b5b892df20a09db3 Mon Sep 17 00:00:00 2001
From: ryanhamley <ryan.hamley@mapbox.com>
Date: Tue, 17 Sep 2019 17:59:56 -0700
Subject: [PATCH] Resolve conflicts

---
 .../expression/definitions/image.js           |  6 ++---
 src/style-spec/expression/index.js            |  2 +-
 src/style-spec/expression/types.js            | 22 +++++++++----------
 src/style-spec/expression/values.js           |  2 +-
 src/style-spec/function/index.js              |  4 ++--
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/style-spec/expression/definitions/image.js b/src/style-spec/expression/definitions/image.js
index 1a60bdb17fb..6d19e23330a 100644
--- a/src/style-spec/expression/definitions/image.js
+++ b/src/style-spec/expression/definitions/image.js
@@ -1,11 +1,11 @@
 // @flow
 
-import { ImageType, StringType } from '../types';
+import {ImageType, StringType} from '../types';
 
-import type { Expression } from '../expression';
+import type {Expression} from '../expression';
 import type EvaluationContext from '../evaluation_context';
 import type ParsingContext from '../parsing_context';
-import type { Type } from '../types';
+import type {Type} from '../types';
 
 export default class ImageExpression implements Expression {
     type: Type;
diff --git a/src/style-spec/expression/index.js b/src/style-spec/expression/index.js
index d24146d6d91..7f6ae543f7c 100644
--- a/src/style-spec/expression/index.js
+++ b/src/style-spec/expression/index.js
@@ -350,7 +350,7 @@ function findZoomCurve(expression: Expression): Step | Interpolate | ParsingErro
     return result;
 }
 
-import { ColorType, StringType, NumberType, BooleanType, ValueType, FormattedType, ImageType, array } from './types';
+import {ColorType, StringType, NumberType, BooleanType, ValueType, FormattedType, ImageType, array} from './types';
 
 function getExpectedType(spec: StylePropertySpecification): Type {
     const types = {
diff --git a/src/style-spec/expression/types.js b/src/style-spec/expression/types.js
index c178f85f06d..6e89a87dc3d 100644
--- a/src/style-spec/expression/types.js
+++ b/src/style-spec/expression/types.js
@@ -34,17 +34,17 @@ export type ArrayType = {
     N: ?number
 }
 
-export const NullType = { kind: 'null' };
-export const NumberType = { kind: 'number' };
-export const StringType = { kind: 'string' };
-export const BooleanType = { kind: 'boolean' };
-export const ColorType = { kind: 'color' };
-export const ObjectType = { kind: 'object' };
-export const ValueType = { kind: 'value' };
-export const ErrorType = { kind: 'error' };
-export const CollatorType = { kind: 'collator' };
-export const FormattedType = { kind: 'formatted' };
-export const ImageType = { kind: 'image' };
+export const NullType = {kind: 'null'};
+export const NumberType = {kind: 'number'};
+export const StringType = {kind: 'string'};
+export const BooleanType = {kind: 'boolean'};
+export const ColorType = {kind: 'color'};
+export const ObjectType = {kind: 'object'};
+export const ValueType = {kind: 'value'};
+export const ErrorType = {kind: 'error'};
+export const CollatorType = {kind: 'collator'};
+export const FormattedType = {kind: 'formatted'};
+export const ImageType = {kind: 'image'};
 
 export function array(itemType: Type, N: ?number): ArrayType {
     return {
diff --git a/src/style-spec/expression/values.js b/src/style-spec/expression/values.js
index 405fa6b2144..5ba9004a329 100644
--- a/src/style-spec/expression/values.js
+++ b/src/style-spec/expression/values.js
@@ -6,7 +6,7 @@ import Color from '../util/color';
 import Collator from './types/collator';
 import Formatted from './types/formatted';
 import Image from './types/image';
-import { NullType, NumberType, StringType, BooleanType, ColorType, ObjectType, ValueType, CollatorType, FormattedType, ImageType, array } from './types';
+import {NullType, NumberType, StringType, BooleanType, ColorType, ObjectType, ValueType, CollatorType, FormattedType, ImageType, array} from './types';
 
 import type {Type} from './types';
 
diff --git a/src/style-spec/function/index.js b/src/style-spec/function/index.js
index 8d70dc0803b..13f944288ba 100644
--- a/src/style-spec/function/index.js
+++ b/src/style-spec/function/index.js
@@ -7,8 +7,8 @@ import * as interpolate from '../util/interpolate';
 import Interpolate from '../expression/definitions/interpolate';
 import Formatted from '../expression/types/formatted';
 import Image from '../expression/types/image';
-import { supportsInterpolation } from '../util/properties';
-import { findStopLessThanOrEqualTo } from '../expression/stops';
+import {supportsInterpolation} from '../util/properties';
+import {findStopLessThanOrEqualTo} from '../expression/stops';
 
 export function isFunction(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);