lizhengwei / aigc-embedding-service

Go to a project
Toggle navigation Toggle navigation pinning
lizhengwei
47f59224 1 parent beeba137

jira:NYJ-1540 desc: handle conflict

Inline Side-by-side
Showing 2 changed files with 0 additions and 8 deletions
@@ -7,11 +7,7 @@ from langchain_core.messages import SystemMessage, HumanMessage @@ -7,11 +7,7 @@ from langchain_core.messages import SystemMessage, HumanMessage
7 from langchain_openai import ChatOpenAI 7 from langchain_openai import ChatOpenAI
8 8
9 try: 9 try:
10 -<<<<<<<< HEAD:src/football_replay_match/core/football_replay_match_live.py  
11 - from football_replay_match.util.llm_video_content import contents as video_contents  
12 -========  
13 from .llm_image import Video2Frame 10 from .llm_image import Video2Frame
14 ->>>>>>>> b6bd61f9eadc8b70a6ff2e7925f45fc7a9ed39f0:src/football_replay_match/core/utils/football_replay_match_live.py  
15 except: 11 except:
16 from llm_image import Video2Frame 12 from llm_image import Video2Frame
17 13
@@ -6,11 +6,7 @@ from langchain_core.messages import SystemMessage, HumanMessage @@ -6,11 +6,7 @@ from langchain_core.messages import SystemMessage, HumanMessage
6 from langchain_openai import ChatOpenAI 6 from langchain_openai import ChatOpenAI
7 7
8 try: 8 try:
9 -<<<<<<<< HEAD:src/football_replay_match/core/football_replay_video_event_by_llm.py  
10 - from football_replay_match.util.llm_video_content import contents as video_contents  
11 -========  
12 from .llm_image import Video2Frame 9 from .llm_image import Video2Frame
13 ->>>>>>>> b6bd61f9eadc8b70a6ff2e7925f45fc7a9ed39f0:src/football_replay_match/core/utils/football_replay_video_event_by_llm.py  
14 except: 10 except:
15 from llm_image import Video2Frame 11 from llm_image import Video2Frame
16 12