aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bugzillaBugTriage.js4
1 files changed, 0 insertions, 4 deletions
diff --git a/bugzillaBugTriage.js b/bugzillaBugTriage.js
index c14e3ec..97b9568 100644
--- a/bugzillaBugTriage.js
+++ b/bugzillaBugTriage.js
@@ -1959,11 +1959,7 @@ 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;