From b2861e019ba5409c99d00971224b1fd111f952aa Mon Sep 17 00:00:00 2001 From: hj24 Date: Thu, 2 Apr 2026 18:16:31 +0800 Subject: [PATCH] fix: merge error --- api/services/billing_service.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/api/services/billing_service.py b/api/services/billing_service.py index 8899d2e870..a183f09370 100644 --- a/api/services/billing_service.py +++ b/api/services/billing_service.py @@ -2,11 +2,7 @@ import json import logging import os from collections.abc import Sequence -<<<<<<< HEAD -from typing import Literal, NotRequired -======= -from typing import Literal, TypedDict ->>>>>>> chore-debug-partnerstack +from typing import Literal, NotRequired, TypedDict import httpx from pydantic import TypeAdapter