running pre-commit to make sure linting pass

Signed-off-by: sitloboi2012 <[email protected]>
vllm-project · Feb 13, 2025 · 209dac7 · 209dac7
1 parent 636eb2a
commit 209dac7
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/observability/README.md b/observability/README.md
@@ -15,10 +15,7 @@ Make sure to have:
   - Or follow our [tutorial](tutorials/00-install-kubernetes-env.md)
 
 After that you can run:
-<<<<<<< HEAD
 
-=======
->>>>>>> cccef7d (update vllm-dashboard and router to contain add on metrics such as coree vLLM metrics, operational metrics, router observe metrics, update requirement.txt for router and tests, update install-minikube-cluster to be more logging info, restart docker service and minikube context after the run)
 ```bash
 sudo bash install.sh
 ```

diff --git a/src/tests/requirements.txt b/src/tests/requirements.txt
@@ -1,10 +1,5 @@
 fastapi
 httpx
-<<<<<<< HEAD
-openai
-uvicorn
-=======
->>>>>>> 2ba572e (run pre-commit for linting)
 openai
 uvicorn
 vllm