merge

Author: bcm-at-zama

_blog.yml

@@ -3734,8 +3734,6 @@
   tags:
     - security
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 - local: codegemma
   title: "CodeGemma - an official Google release for code LLMs"
   author: pcuenq
@@ -3747,13 +3745,9 @@
     - research
     - LLM
     - gcp
-=======
-- local: concrete-ml-inference-on-endpoints-fhe
-  title: "Running Privacy-Preserving Inferences on Hugging Face EndPoints"
-=======
+
 - local: fhe-endpoints
   title: "Running Privacy-Preserving Inference on Hugging Face Endpoints"
->>>>>>> 1dfe887 (reviews (to be squashed))
   author: binoua
   guest: true
   thumbnail: /blog/assets/fhe-endpoints/thumbnail.png
@@ -3763,4 +3757,3 @@
     - privacy
     - research
     - FHE
->>>>>>> 0fe12cc (Add a blog about how to use HF endpoints to run Concrete-ML privacy-preserving ML models.)