phoenix-oss/llama-stack-mirror
0
0
Fork 1
mirror of https://github.com/meta-llama/llama-stack.git synced 2026-01-03 06:52:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolved merge conflicts

Browse source
This commit is contained in:
Chantal D Gama Rose 2025-03-14 14:18:23 -07:00
parent 3b3195d8e6
commit eebb0f6e61
8 changed files with 0 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

3
llama_stack/templates/open-benchmark/__init__.py
View file

@ -3,8 +3,5 @@
#
# This source code is licensed under the terms described in the LICENSE file in
# the root directory of this source tree.
<<<<<<<< HEAD:llama_stack/templates/open-benchmark/__init__.py
from .open_benchmark import get_distribution_template # noqa: F401
========
>>>>>>>> upstream/main:llama_stack/providers/inline/scoring/basic/utils/bfcl/__init__.py