From 7f8051f6a08a0053c821867cdd272911c630dae5 Mon Sep 17 00:00:00 2001
From: "Bradley M. Kuhn" <bkuhn@ebb.org>
Date: Sun, 1 Sep 2013 11:20:27 -0400
Subject: [PATCH] A few recent changes.

---
 conkerorrc | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/conkerorrc b/conkerorrc
index 44f52a4..2315e49 100644
--- a/conkerorrc
+++ b/conkerorrc
@@ -1,10 +1,7 @@
-require("block-content-focus-change.js");
-require("extensions/noscript.js");
-require("session.js");
-
+session_pref("xpinstall.whitelist.required", false);
 define_key(default_global_keymap, "C-o", "cmd_scrollPageUp");
 define_key(default_base_keymap, "C-o", "cmd_scrollPageUp");
-define_key(default_global_keymap, "C-j", "ns-toggle-temp");
+// define_key(default_global_keymap, "C-j", "ns-toggle-temp");
 
 url_completion_use_bookmarks = true;
 url_completion_use_history = false;