Merge branch 'main' into main

rapidsai · Jun 5, 2024 · a68e7a7 · a68e7a7
2 parents 5f2e339 + 6f0c40a
commit a68e7a7
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/layouts/index.html b/layouts/index.html
@@ -13,6 +13,7 @@
     (dict
         "text" "New: cuDF now pre-installed in Google Colab"
         "url" "https://developer.nvidia.com/blog/rapids-cudf-instantly-accelerates-pandas-up-to-50x-on-google-colab/?ncid=em-news-294101"
+<<<<<<< main
     )
     (dict
         "text" "New: cuVS Vector Search"
@@ -21,14 +22,25 @@
     (dict
         "text" "Catch up with GTC'24 On-Demand"
         "url" "https://www.nvidia.com/gtc/"
+=======
+>>>>>>> main
     )
     (dict
-        "text" "RAPIDS 24.04 Released"
-        "url" "https://docs.rapids.ai/install#selector"
+        "text" "New: cuVS Vector Search"
+        "url" "/cuvs"
+    )
+    (dict
+        "text" "Catch up with GTC'24 On-Demand"
+        "url" "https://www.nvidia.com/gtc/"
     )
     (dict
+<<<<<<< main
         "text" "Notice: Pascal Deprecation"
         "url" "https://docs.rapids.ai/notices/rsn0034/"
+=======
+        "text" "RAPIDS 24.04 Released"
+        "url" "https://docs.rapids.ai/install#selector"
+>>>>>>> main
     )
 }}
 <section class="row">