diff options
author | Steven Wittens <steven@10.no-reply.drupal.org> | 2005-12-21 15:04:23 +0000 |
---|---|---|
committer | Steven Wittens <steven@10.no-reply.drupal.org> | 2005-12-21 15:04:23 +0000 |
commit | 4b0067ee16b01e80771875ca3964dcdda6846942 (patch) | |
tree | 9772acc4f1ee9b9b06fe1fd1b83ef693cd313fc6 /misc | |
parent | 42f5ddd3477b9d75a879e4be60fe7a2757b79572 (diff) | |
download | brdo-4b0067ee16b01e80771875ca3964dcdda6846942.tar.gz brdo-4b0067ee16b01e80771875ca3964dcdda6846942.tar.bz2 |
- Oopsie, faulty rcsmerge
Diffstat (limited to 'misc')
-rw-r--r-- | misc/drupal.js | 6 |
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(); |