merge conflict

redis-developer · May 28, 2024 · 4b9d1b2 · 4b9d1b2
2 parents 438489a + 83b1bff
commit 4b9d1b2
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/python-recipes/RAG/03_llamaindex.ipynb b/python-recipes/RAG/03_llamaindex.ipynb
@@ -89,7 +89,10 @@
         }
       ],
       "source": [
+<<<<<<< HEAD
         "# NBVAL_SKIP\n",
+=======
+>>>>>>> 83b1bff7940e4bd05b0ce7e3e4c38c2b04b45a95
         "%pip install -U -q llama-index llama-index-vector-stores-redis llama-index-embeddings-cohere llama-index-embeddings-openai"
       ]
     },