bad merge

stripe · Dec 4, 2023 · 3a9efea · 3a9efea
1 parent aef62b0
commit 3a9efea
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/src/main/java/com/stripe/net/LiveStripeResponseGetter.java b/src/main/java/com/stripe/net/LiveStripeResponseGetter.java
@@ -88,19 +88,11 @@ public InputStream requestStream(APIRequest apiRequest) throws StripeException {
         fullUrl(apiRequest.getBaseAddress(), apiRequest.getOptions(), apiRequest.getPath());
 
     StripeRequest request =
-<<<<<<< HEAD
-        new StripeRequest(method, fullUrl, params, RequestOptions.merge(this.options, options));
-||||||| parent of a9aca7bc7e (wip)
-        new StripeRequest(
-            method, fullUrl, params, RequestOptions.merge(this.options, options), this.usage);
-=======
         new StripeRequest(
             apiRequest.getMethod(),
             fullUrl,
             apiRequest.getParams(),
-            RequestOptions.merge(this.options, apiRequest.getOptions()),
-            this.usage);
->>>>>>> a9aca7bc7e (wip)
+            RequestOptions.merge(this.options, apiRequest.getOptions()));
     StripeResponseStream responseStream = httpClient.requestStreamWithRetries(request);
 
     int responseCode = responseStream.code();