Bug 1543077 - Fix merge conflict bustage, add missing comma. r=bustage-fix CLOSED TREE

--HG--
extra : amend_source : 81882c10b7f3bee85f2acb3a38489b566f4684c1

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