Add

backend/moonstreamapi/routes/subscriptions.py

@@ -278,6 +278,7 @@ async def get_subscriptions_handler(request: Request) -> data.SubscriptionsListR
         reporter.error_report(e)
         raise MoonstreamHTTPException(status_code=500, internal_error=e)
 
+<<<<<<< Updated upstream
     subscriptions = []
 
     for subscription in subscriprions_list.entities:
@@ -298,6 +299,12 @@ async def get_subscriptions_handler(request: Request) -> data.SubscriptionsListR
                 label = tag["label"]
 
         subscriptions.append(
+=======
+    pprint(resources.resources)
+
+    return data.SubscriptionsListResponse(
+        subscriptions=[
+>>>>>>> Stashed changes
             data.SubscriptionResourceData(
                 id=str(subscription.entity_id),
                 user_id=str(user.id),

backend/moonstreamapi/settings.py

@@ -2,6 +2,10 @@ import os
 
 from bugout.app import Bugout
 from entity.client import Entity
+<<<<<<< Updated upstream
+=======
+
+>>>>>>> Stashed changes
 
 # Bugout
 BUGOUT_BROOD_URL = os.environ.get("BUGOUT_BROOD_URL", "https://auth.bugout.dev")