Merge m-c to m-i

MozReview-Commit-ID: 4q0ETTbxYNu
Brli · Oct 6, 2016 · 72205ff · 72205ff
2 parents a7dd1a0 + 4c2b463
commit 72205ff
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/devtools/client/preferences/devtools.js b/devtools/client/preferences/devtools.js
@@ -315,11 +315,7 @@ pref("devtools.webconsole.timestampMessages", false);
 pref("devtools.webconsole.autoMultiline", true);
 
 // Enable the experimental webconsole frontend (work in progress)
-#if defined(NIGHTLY_BUILD)
-pref("devtools.webconsole.new-frontend-enabled", true);
-#else
 pref("devtools.webconsole.new-frontend-enabled", false);
-#endif
 
 // Enable the experimental support for source maps in console (work in progress)
 pref("devtools.sourcemap.locations.enabled", false);