Merge branch 'main' of https://github.com/Victorsesan/opentelemetry.io

Victorsesan · Nov 15, 2024 · 42d48fe · 42d48fe
2 parents b6aafb4 + 13e2b44
commit 42d48fe
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/content/es/docs/kubernetes/getting-started.md b/content/es/docs/kubernetes/getting-started.md
@@ -90,11 +90,7 @@ Esta instancia del collector utilizará los siguientes componentes:
 - [Filelog Receiver](../collector/components/#filelog-receiver): para recopilar
   Registros de Kubernetes y registros de aplicaciones escritos en stdout/stderr.
 
-<<<<<<< HEAD
-Veamos sus partes.
-=======
-Vamos a ver sus partes.
->>>>>>> 13e2b443a16f06d25a1f8500ec1b536d6261a78c
+Vamos a descomponerlos.
 
 ### Receptor OTLP