Rebase PR and address merge conflicts

SatelliteQE · Nov 8, 2023 · 0996b26 · 0996b26
1 parent 14c039a
commit 0996b26
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/manifester/helpers.py b/manifester/helpers.py
@@ -14,7 +14,6 @@ def simple_retry(cmd, cmd_args=None, cmd_kwargs=None, max_timeout=240, _cur_time
     # with caution as some data (notably the offline token) should be treated as a secret.
     logger.debug(f"Sending request to endpoint {cmd_args}")
     response = cmd(*cmd_args, **cmd_kwargs)
-    breakpoint()
     logger.debug(f"Response status code is {response.status_code}")
     if response.status_code in [429, 500, 504]:
         new_wait = _cur_timeout * 2

diff --git a/manifester/manifester.py b/manifester/manifester.py
@@ -211,7 +211,6 @@ def verify_allocation_entitlements(self, entitlement_quantity, subscription_name
         current_entitlement = [
             d
             for d in self.entitlement_data["body"]["entitlementsAttached"]["value"]
-CONFLICT (content): Merge conflict in manifester/manifester.py
             if d["subscriptionName"] == subscription_name
         ]
         if not current_entitlement: