fix: merge errors

ZackBradshaw · Apr 22, 2024 · 73d8947 · 73d8947
1 parent 6882e22
commit 73d8947
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/docs/source/models/engine_args.rst b/docs/source/models/engine_args.rst
@@ -9,10 +9,14 @@ Below, you can find an explanation of every engine argument for vLLM:
     :module: vllm.engine.arg_utils
     :func: _engine_args_parser
     :prog: -m vllm.entrypoints.openai.api_server
+<<<<<<< HEAD
 <<<<<<< HEAD
     :nodefaultconst:
 =======
 >>>>>>> 682789d (Fix missing docs and out of sync `EngineArgs` (#4219))
+=======
+    :nodefaultconst:
+>>>>>>> fe7d648 (Don't show default value for flags in `EngineArgs` (#4223))
 
 Async Engine Arguments
 ----------------------
@@ -22,9 +26,14 @@ Below are the additional arguments related to the asynchronous engine:
 .. argparse::
     :module: vllm.engine.arg_utils
     :func: _async_engine_args_parser
+<<<<<<< HEAD
 <<<<<<< HEAD
     :prog: -m vllm.entrypoints.openai.api_server
     :nodefaultconst:
 =======
     :prog: -m vllm.entrypoints.openai.api_server
 >>>>>>> 682789d (Fix missing docs and out of sync `EngineArgs` (#4219))
+=======
+    :prog: -m vllm.entrypoints.openai.api_server
+    :nodefaultconst:
+>>>>>>> fe7d648 (Don't show default value for flags in `EngineArgs` (#4223))