aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/main.js6
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/main.js b/lib/main.js
index 65e296e..80144cc 100644
--- a/lib/main.js
+++ b/lib/main.js
@@ -116,21 +116,15 @@ var contentScriptLibraries = [
self.data.url('lib/urltest.js'),
self.data.url("lib/jumpNextBug.js"),
self.data.url("lib/util.js"),
-<<<<<<< HEAD
self.data.url("lib/queries.js"),
-=======
->>>>>>> 3c073b249228b929ba3ef7c620ddb62220503ec1
self.data.url("lib/preprocessDuplicates.js"),
self.data.url("lib/viewSource.js"),
self.data.url("lib/color.js"),
self.data.url("lib/addNewLinks.js"),
-<<<<<<< HEAD
self.data.url("lib/bugzillaDOMFunctions.js"),
self.data.url("lib/otherButtons.js"),
self.data.url("lib/makeBacktraceAttachment.js"),
self.data.url("lib/fixingAttMIME.js"),
-=======
->>>>>>> 3c073b249228b929ba3ef7c620ddb62220503ec1
self.data.url("lib/logging-front.js"),
self.data.url('lib/bug-page-mod.js'),
self.data.url("lib/rhbzpage.js"),