From 8b34294c9731ef56e787e4485a52f958d6655243 Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Wed, 26 Aug 2020 15:24:46 -0700 Subject: [PATCH] Fix merge conflict in Mime.ts --- ts/types/MIME.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/ts/types/MIME.ts b/ts/types/MIME.ts index 994bff32e8..5b7420051f 100644 --- a/ts/types/MIME.ts +++ b/ts/types/MIME.ts @@ -8,7 +8,6 @@ export const IMAGE_GIF = 'image/gif' as MIMEType; export const IMAGE_JPEG = 'image/jpeg' as MIMEType; export const IMAGE_PNG = 'image/png' as MIMEType; export const IMAGE_WEBP = 'image/webp' as MIMEType; -export const IMAGE_PNG = 'image/png' as MIMEType; export const VIDEO_MP4 = 'video/mp4' as MIMEType; export const VIDEO_QUICKTIME = 'video/quicktime' as MIMEType; export const LONG_MESSAGE = 'text/x-signal-plain' as MIMEType;