diff options
| author | Matěj Cepl <mcepl@redhat.com> | 2011-03-25 18:00:44 +0100 |
|---|---|---|
| committer | Matěj Cepl <mcepl@redhat.com> | 2011-03-25 18:00:44 +0100 |
| commit | 64af358652bd1d0a570793fa2bc9368ccd2cc686 (patch) | |
| tree | 3bc71c5e8f2cd48048c025e774ccd4722eb9ce73 /lib | |
| parent | 0ace4d34ece35b717b64ee1d3312cdc3c07696b5 (diff) | |
| parent | 3c073b249228b929ba3ef7c620ddb62220503ec1 (diff) | |
| download | bugzilla-triage-64af358652bd1d0a570793fa2bc9368ccd2cc686.tar.gz | |
Merge branch 'next' of gitorious.org:addon-sdk/bugzilla-triage-scripts into next
Conflicts:
data/lib/rhbzpage.js
lib/main.js
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/main.js | 6 |
1 files changed, 6 insertions, 0 deletions
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"), |