resolve merge conflict

DurgNomis-drol · Feb 13, 2024 · 64029ff · 64029ff
2 parents 0ac3e0f + c0507c3
commit 64029ff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/mytoyota/models/endpoints/vehicle_guid.py b/mytoyota/models/endpoints/vehicle_guid.py
@@ -425,7 +425,7 @@ class VehicleGuidModel(BaseModel):
         alias="serviceConnectStatus"
     )  # TODO unsure what this returns
     services: List[Any]  # TODO unsure what this returns
-    shop_genuine_parts_url: str = Field(alias="shopGenuinePartsUrl")
+    shop_genuine_parts_url: Optional[str] = Field(alias="shopGenuinePartsUrl")
     status: str
     stock_pic_reference: str = Field(alias="stockPicReference")
     subscriber_guid: UUID = Field(alias="subscriberGuid")

diff --git a/poetry.lock b/poetry.lock