diff options
| author | Matěj Cepl <mcepl@redhat.com> | 2010-05-03 14:54:37 +0200 |
|---|---|---|
| committer | Matěj Cepl <mcepl@redhat.com> | 2010-05-03 14:54:37 +0200 |
| commit | de4754b15b594192a82ee196af88602648a215e7 (patch) | |
| tree | 74207752dc40e3d79c7dcff9cde30ce40d80abed | |
| parent | 0b742126acad12af78fe379474d735f772baeae3 (diff) | |
| parent | a730450bf18d2138ae30db3793f2a63f77836157 (diff) | |
| download | bugzilla-triage-de4754b15b594192a82ee196af88602648a215e7.tar.gz | |
Merge branch 'master' of ssh://git.fedorahosted.org/git/bugzilla-triage-scripts
Conflicts:
bugzillaBugTriage.js
| -rw-r--r-- | bugzillaBugTriage.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bugzillaBugTriage.js b/bugzillaBugTriage.js index 97b9568..c14e3ec 100644 --- a/bugzillaBugTriage.js +++ b/bugzillaBugTriage.js @@ -1959,7 +1959,11 @@ RHBugzillaPage.prototype.fixAttachById = function(id, type, email) { msg.addParameter(this.login); console.log("XML-RPC message:\n"+msg.xml()); msg.addParameter(this.password); +<<<<<<< HEAD console.log("XML-RPC message:\n"+msg.xml()); +======= + console.log("XML-RPC message:\n" + msg.xml()); +>>>>>>> 1c5b90c198ffd4c9508ac9ba6c0e67de8e08da37 var req = new XMLHttpRequest(); var that = this; |