diff options
| author | Matěj Cepl <mcepl@redhat.com> | 2011-03-25 18:03:48 +0100 |
|---|---|---|
| committer | Matěj Cepl <mcepl@redhat.com> | 2011-03-25 18:03:48 +0100 |
| commit | f167ed681ed2de8492c2159f2ea588ab6c44d40d (patch) | |
| tree | 24e41c60afbaf3aaf3cebd3b54c226578a901ce5 /lib | |
| parent | 64af358652bd1d0a570793fa2bc9368ccd2cc686 (diff) | |
| download | bugzilla-triage-f167ed681ed2de8492c2159f2ea588ab6c44d40d.tar.gz | |
Fix ommitted merge conflict in lib/main.js
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/main.js | 6 |
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"), |