wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 767045 - Unfinished merge of marionettecomponent.js commited; r=mdas

Browse Source
This commit is contained in:
Kyle Machulis 2012-06-21 10:43:24 -07:00
parent 4072914c68
commit 194522922c
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
testing/marionette/components/marionettecomponent.js
View File

@ -81,12 +81,8 @@ MarionetteComponent.prototype = {
Services.prefs.setBoolPref(DEBUGGER_ENABLED_PREF, true);
// Always allow remote connections.
DebuggerServer.initTransport(function () { return true; });
<<<<<<< local
DebuggerServer.openListener(port);
=======
DebuggerServer.openListener(port, true);
Services.prefs.setBoolPref(DEBUGGER_ENABLED_PREF, original);
>>>>>>> other
}
catch(e) {
this.logger.error('exception: ' + e.name + ', ' + e.message);