fixed broken comment
This commit is contained in:
parent
096247e7cf
commit
657009646d
1 changed files with 4 additions and 0 deletions
|
|
@ -436,6 +436,7 @@ defaultPref("media.gmp-widevinecdm.visible", false);
|
|||
defaultPref("media.gmp-widevinecdm.enabled", false);
|
||||
defaultPref("media.gmp-provider.enabled", false);
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
defaultPref("media.gmp-manager.url", "data:text/plain,"); // had to re-add to prevent connections
|
||||
|
||||
<<<<<<< HEAD
|
||||
|
|
@ -444,6 +445,9 @@ defaultPref("media.gmp-gmpopenh264.enabled", false);
|
|||
=======
|
||||
defaultPref("media.gmp-manager.url", "data:text/plain,"); had to re-add to prevent connections
|
||||
>>>>>>> 814a479 (reviewed DRM, removed ircs hand, moved exp prefs)
|
||||
=======
|
||||
defaultPref("media.gmp-manager.url", "data:text/plain,"); // had to re-add to prevent connections
|
||||
>>>>>>> f733a19 (fixed broken comment)
|
||||
|
||||
// ----------------------
|
||||
// # WEBRTC
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue