From b252cc4c56d264944545059f158b2fb44fd002ef Mon Sep 17 00:00:00 2001 From: Steven Date: Wed, 21 Oct 2020 15:46:06 -0400 Subject: [PATCH] Fix merge conflict --- packages/next/client/image.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/next/client/image.tsx b/packages/next/client/image.tsx index db30fe3a688a54f..93a3b3732967888 100644 --- a/packages/next/client/image.tsx +++ b/packages/next/client/image.tsx @@ -4,7 +4,7 @@ import Head from '../next-server/lib/head' const loaders = new Map string>([ ['imgix', imgixLoader], ['cloudinary', cloudinaryLoader], - ['akamai', akamaiLoader] + ['akamai', akamaiLoader], ['default', defaultLoader], ])