From 82c642f78d2e06033f31d00c8d4438b3e766e9d8 Mon Sep 17 00:00:00 2001 From: ishaan-jaff Date: Fri, 29 Sep 2023 21:16:06 -0700 Subject: [PATCH] fix merge conflicts --- litellm/proxy/proxy_cli.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/litellm/proxy/proxy_cli.py b/litellm/proxy/proxy_cli.py index 8022fd420ec..5dbb1adc305 100644 --- a/litellm/proxy/proxy_cli.py +++ b/litellm/proxy/proxy_cli.py @@ -33,9 +33,6 @@ def run_server(port, api_base, model, deploy, debug, temperature, max_tokens, te from proxy_server import app, initialize initialize(model, api_base, debug, temperature, max_tokens, telemetry) -def run_server(port, api_base, model, debug, temperature, max_tokens, telemetry, deploy): - from .proxy_server import app, initialize - initialize(model, api_base, debug, temperature, max_tokens, telemetry, deploy) try: import uvicorn