From 43ec63a7b1ec054bf89cf0e246358220356969d8 Mon Sep 17 00:00:00 2001 From: Jesse MacFadyen Date: Tue, 11 Jul 2017 16:40:55 -0700 Subject: [PATCH] fix merge conflict --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2ba0df7..6bdbfd5 100644 --- a/README.md +++ b/README.md @@ -100,7 +100,7 @@ __Parameters__: - __mimeType__: The mime type of the data to upload. Defaults to `image/jpeg`. (DOMString) - __params__: A set of optional key/value pairs to pass in the HTTP request. (Object, key/value - DOMString) - __chunkedMode__: Whether to upload the data in chunked streaming mode. Defaults to `true`. (Boolean) - - __headers__: A map of header name/header values. Use an array to specify more than one value. On iOS, FireOS, and Android, if a header named Content-Type is present, multipart form data will NOT be used. (Object) + - __headers__: A map of header name/header values. Use a hash to specify one or more than one value. On iOS, FireOS, and Android, if a header named Content-Type is present, multipart form data will NOT be used. (Object) - __trustAllHosts__: Optional parameter, defaults to `false`. If set to `true`, it accepts all security certificates. This is useful since Android rejects self-signed security certificates. Not recommended for production use. Supported on Android and iOS. _(boolean)_ @@ -159,7 +159,7 @@ options.fileKey="file"; options.fileName=fileURL.substr(fileURL.lastIndexOf('/')+1); options.mimeType="text/plain"; -var headers={'headerParam':'headerValue'}; +var headers={'headerParam':'headerValue', 'headerParam2':'headerValue2'}; options.headers = headers;