From d68454d1da6abffc708ecf556baca5ce44f873a7 Mon Sep 17 00:00:00 2001 From: Cosmin Sabou Date: Mon, 3 Jun 2019 19:49:09 +0300 Subject: [PATCH] Bug 1543077 - Fix merge conflict bustage, add missing comma. r=bustage-fix CLOSED TREE --HG-- extra : amend_source : 81882c10b7f3bee85f2acb3a38489b566f4684c1 --- parser/nsCharsetSource.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parser/nsCharsetSource.h b/parser/nsCharsetSource.h index 2beece8fb9ce..fc491de4125d 100644 --- a/parser/nsCharsetSource.h +++ b/parser/nsCharsetSource.h @@ -23,7 +23,7 @@ enum { kCharsetFromOtherComponent, kCharsetFromParentForced, // propagates to child frames kCharsetFromUserForced, // propagates to child frames - kCharsetFromUserForcedAutoDetection + kCharsetFromUserForcedAutoDetection, kCharsetFromByteOrderMark, kCharsetFromUtf8OnlyMime, // For JSON, WebVTT and such kCharsetFromBuiltIn, // resource: URLs