Rebase PR and address merge conflicts

SatelliteQE · Nov 8, 2023 · 5dcf41c · 5dcf41c
1 parent 14c039a
commit 5dcf41c
Showing 1 changed file with 0 additions and 1 deletion.
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: