gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-20 22:47:59 +01:00
Code Issues Projects Releases Wiki Activity

Finish this ridiculously botched merge.

Browse Source
This commit is contained in:
Kris Maglione
2009-03-30 01:20:18 -04:00
parent 2a88d8a3bf
commit 3a60d9e530
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/content/buffer.js
View File

@@ -602,7 +602,6 @@ function Buffer() //{{{
commands.add(["st[op]"], commands.add(["st[op]"],
"Stop loading", "Stop loading",
<<<<<<< HEAD:common/content/buffer.js
function () function ()
{ {
if (config.stop) if (config.stop)
@@ -610,9 +609,6 @@ function Buffer() //{{{
else else
window.BrowserStop(); window.BrowserStop();
}, },
=======
function () { window.BrowserStop(); },
>>>>>>> a9f04ee3d00b282e7a91b37eb23168fb39e9de5b:common/content/buffer.js
{ argCount: "0" }); { argCount: "0" });
commands.add(["vie[wsource]"], commands.add(["vie[wsource]"],