diff options
| -rw-r--r-- | data/lib/rhbzpage.js | 2 | ||||
| -rw-r--r-- | lib/main.js | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/data/lib/rhbzpage.js b/data/lib/rhbzpage.js index 81116ba..98a5175 100644 --- a/data/lib/rhbzpage.js +++ b/data/lib/rhbzpage.js @@ -140,8 +140,6 @@ function RHcentralCommandDispatch(cmdLabel, cmdParams) { } } -/* === Bugzilla functions === */ - /** * Make it sailent that the some attachments with bad MIME type are present * diff --git a/lib/main.js b/lib/main.js index 80144cc..65e296e 100644 --- a/lib/main.js +++ b/lib/main.js @@ -116,15 +116,21 @@ 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"), |