From f167ed681ed2de8492c2159f2ea588ab6c44d40d Mon Sep 17 00:00:00 2001
From: Matěj Cepl <mcepl@redhat.com>
Date: Fri, 25 Mar 2011 18:03:48 +0100
Subject: Fix ommitted merge conflict in lib/main.js

---
 lib/main.js | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'lib')

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"),
-- 
cgit