From efbec4230b7473fb96d3e7688ed90fec5efbad2f Mon Sep 17 00:00:00 2001 From: Ishaan Jaff Date: Wed, 11 Dec 2024 01:08:43 -0800 Subject: [PATCH] fix merge conflicts --- litellm/llms/triton/completion/transformation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/litellm/llms/triton/completion/transformation.py b/litellm/llms/triton/completion/transformation.py index ccf920ddb9..fafdc027ea 100644 --- a/litellm/llms/triton/completion/transformation.py +++ b/litellm/llms/triton/completion/transformation.py @@ -6,12 +6,12 @@ from typing import Any, Dict, List, Optional, Union from httpx import Headers, Response +from litellm.litellm_core_utils.prompt_templates.factory import prompt_factory from litellm.llms.base_llm.transformation import ( BaseConfig, BaseLLMException, LiteLLMLoggingObj, ) -from litellm.llms.prompt_templates.factory import prompt_factory from litellm.types.llms.openai import AllMessageValues from litellm.types.utils import ModelResponse