Skip to content

Commit ce2b296

Browse files
committed
fix: remove remaining conflict markers
1 parent fc18746 commit ce2b296

File tree

5 files changed

+0
-5
lines changed

5 files changed

+0
-5
lines changed

graphgen/models/llm/local/vllm_wrapper.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ class VLLMWrapper(BaseLLMWrapper):
88
"""
99
Async inference backend based on vLLM.
1010
"""
11-
>>>>>>> feature/multi-omics-qa
1211
def __init__(
1312
self,
1413
model: str,

graphgen/models/searcher/db/ncbi_searcher.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
)
2020

2121
from graphgen.bases import BaseSearcher
22-
>>>>>>> feature/multi-omics-qa
2322

2423

2524
@lru_cache(maxsize=None)

graphgen/models/searcher/db/rnacentral_searcher.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
)
1919

2020
from graphgen.bases import BaseSearcher
21-
>>>>>>> feature/multi-omics-qa
2221

2322

2423
@lru_cache(maxsize=None)

graphgen/models/searcher/db/uniprot_searcher.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
)
2020

2121
from graphgen.bases import BaseSearcher
22-
>>>>>>> feature/multi-omics-qa
2322

2423

2524
@lru_cache(maxsize=None)

graphgen/operators/quiz/quiz_service.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ class QuizService(BaseOperator):
1212
def __init__(
1313
self,
1414
working_dir: str = "cache",
15-
>>>>>>> feature/multi-omics-qa
1615
quiz_samples: int = 1,
1716
concurrency_limit: int = 200,
1817
):

0 commit comments

Comments
 (0)