mirror of
https://github.com/meta-llama/llama-stack.git
synced 2026-01-02 17:14:30 +00:00
Resolved merge conflicts
This commit is contained in:
parent
3b3195d8e6
commit
eebb0f6e61
8 changed files with 0 additions and 124 deletions
|
|
@ -175,10 +175,7 @@ exclude = [
|
|||
"^llama_stack/apis/inspect/inspect\\.py$",
|
||||
"^llama_stack/apis/models/models\\.py$",
|
||||
"^llama_stack/apis/post_training/post_training\\.py$",
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"^llama_stack/apis/providers/providers\\.py$",
|
||||
>>>>>>> upstream/main
|
||||
"^llama_stack/apis/resource\\.py$",
|
||||
"^llama_stack/apis/safety/safety\\.py$",
|
||||
"^llama_stack/apis/scoring/scoring\\.py$",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue