summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--misc/drupal.js6
1 files changed, 0 insertions, 6 deletions
diff --git a/misc/drupal.js b/misc/drupal.js
index e9c1c373d..d9e706549 100644
--- a/misc/drupal.js
+++ b/misc/drupal.js
@@ -66,15 +66,9 @@ function HTTPGet(uri, callbackFunction, callbackParameter) {
/**
* Creates an HTTP POST request and sends the response to the callback function
-<<<<<<< drupal.js
*
* Note: passing null or undefined for 'object' makes the request fail in Opera 8.
* Pass an empty string instead.
-=======
- *
- * Note: passing null or undefined for 'object' makes the request fail in Opera.
- * Pass an empty string instead, if you must.
->>>>>>> 1.12
*/
function HTTPPost(uri, callbackFunction, callbackParameter, object) {
var xmlHttp = new XMLHttpRequest();