Merge pull request #19 from Conceptron/main

Fix unresolved merge conflict
AdoNunes · Apr 29, 2024 · 338fdea · 338fdea
2 parents b4f797d + 1163499
commit 338fdea
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/DiscordAlertsTrader/brokerages/weBull_api.py b/DiscordAlertsTrader/brokerages/weBull_api.py
@@ -261,14 +261,8 @@ def send_order(self, new_order:dict):
 
         order_response.update(ord_inf)
         return order_response, order_id
-<<<<<<< HEAD
-
-    @retry_on_exception(sleep=1)
-=======
-
 
-    @retry_on_exception()
->>>>>>> 7e19c8c800b6edbbd1b24395c0d09b784f12946c
+    @retry_on_exception(sleep=1)
     def cancel_order(self, order_id:int):
         resp = self.session.cancel_order(order_id)
         return resp