From 6bb7da8e645f806df24f2f3f63175adf2fcb848e Mon Sep 17 00:00:00 2001
From: Chester Curme <chester.curme@gmail.com>
Date: Tue, 7 Jan 2025 18:32:36 -0500
Subject: [PATCH] fix merge

---
 libs/partners/pinecone/poetry.lock | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/libs/partners/pinecone/poetry.lock b/libs/partners/pinecone/poetry.lock
index fda951318e8..febb76c854d 100644
--- a/libs/partners/pinecone/poetry.lock
+++ b/libs/partners/pinecone/poetry.lock
@@ -2154,8 +2154,4 @@ propcache = ">=0.2.0"
 [metadata]
 lock-version = "2.0"
 python-versions = ">=3.9,<3.13"
-<<<<<<< HEAD
-content-hash = "08183c1e9278d2df926a95061f12a52957d08412682698f4ccc7e22e18f99cce"
-=======
-content-hash = "45edeae182a36978fe4c7a68bddbda9b57727141433f457cbf73c9485fcc8749"
->>>>>>> master
+content-hash = "f925e981a714ae693af100fa07b6735f4aef3f1df61f0a728f66b0bd10cb5648"