From a6f055b9a953924c442763c29576ed16cad74e41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= <rleone@scaleway.com>
Date: Tue, 8 Nov 2022 18:33:09 +0100
Subject: [PATCH] Fix

---
 docs/nodes/onprem.md | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/docs/nodes/onprem.md b/docs/nodes/onprem.md
index c659a251..c7a7f01e 100644
--- a/docs/nodes/onprem.md
+++ b/docs/nodes/onprem.md
@@ -343,7 +343,6 @@ Node classes list of onprem provider.
 
 ## onprem.monitoring
 
-<<<<<<< HEAD
 
 <img width="30" src="/img/resources/onprem/monitoring/cortex.png" alt="Cortex" style="float: left; padding-right: 5px;" >
 **diagrams.onprem.monitoring.Cortex**
@@ -386,21 +385,6 @@ Node classes list of onprem provider.
 
 <img width="30" src="/img/resources/onprem/monitoring/zabbix.png" alt="Zabbix" style="float: left; padding-right: 5px;" >
 **diagrams.onprem.monitoring.Zabbix**
-=======
-- **diagrams.onprem.monitoring.Cortex**
-- **diagrams.onprem.monitoring.Datadog**
-- **diagrams.onprem.monitoring.Dynatrace**
-- **diagrams.onprem.monitoring.Grafana**
-- **diagrams.onprem.monitoring.Humio**
-- **diagrams.onprem.monitoring.Nagios**
-- **diagrams.onprem.monitoring.Newrelic**
-- **diagrams.onprem.monitoring.PrometheusOperator**
-- **diagrams.onprem.monitoring.Prometheus**
-- **diagrams.onprem.monitoring.Sentry**
-- **diagrams.onprem.monitoring.Splunk**
-- **diagrams.onprem.monitoring.Thanos**
-- **diagrams.onprem.monitoring.Zabbix**
->>>>>>> fdbd469 (add support for Scaleway products)
 
 ## onprem.network