Skip to content

Commit 68e25ae

Browse files
committed
Merge remote-tracking branch 'origin/main' into dev/shuchang_newjudge
1 parent 55d0ad1 commit 68e25ae

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

tutorial/example_deep_finance/deep_finance_judge.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,7 @@
1515

1616
from openjudge.models.openai_chat_model import OpenAIChatModel
1717
from openjudge.runner.grading_runner import GraderConfig, GradingRunner
18-
<<<<<<< HEAD
1918
from tutorial.example_deep_finance.judge import PresentationQualityGrader, GroundingGrader, CGCVGrader, AuditGrader, TraceabilityRewardGrader, EBTUTraceabilityGrader
20-
=======
21-
from tutorial.example_deep_finance.judge import PresentationQualityGrader, GroundingGrader
22-
>>>>>>> origin/main
2319

2420

2521

0 commit comments

Comments
 (0)