fixing conflict

Sinaptik-AI · Jun 24, 2024 · 9d71e40 · 9d71e40
1 parent fd60bc9
commit 9d71e40
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/pandasai/llm/bedrock_claude.py b/pandasai/llm/bedrock_claude.py
@@ -31,10 +31,7 @@ class BedrockClaude(LLM):
 
     _supported__models = [
         "anthropic.claude-3-opus-20240229-v1:0",
-<<<<<<< fix/adding_sonnet35_to_bedrock
         "anthropic.claude-3-5-sonnet-20240620-v1:0",
-=======
->>>>>>> main
         "anthropic.claude-3-sonnet-20240229-v1:0",
         "anthropic.claude-3-haiku-20240307-v1:0",
     ]