From 1a7407784488fc24219b6773d79767908f4c757a Mon Sep 17 00:00:00 2001
From: Nicolas Arenas <narenas@qindel.com>
Date: Mon, 28 Jul 2025 15:58:54 +0200
Subject: [PATCH] Minor changes

---
 debian/oglog.postinst | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/debian/oglog.postinst b/debian/oglog.postinst
index cd87835..a5a904a 100755
--- a/debian/oglog.postinst
+++ b/debian/oglog.postinst
@@ -248,7 +248,6 @@ create_opensearch_index() {
     done
 }
 
-<<<<<<< HEAD
 
 configure_prometheus() {
     local PROMETHEUS_CONFIG="/etc/prometheus/prometheus.yml"
@@ -270,8 +269,6 @@ EOF
     done
 }
 
-=======
->>>>>>> 0282911 (Initial commit)
 restart_services() {
     echo "Restarting services..."
     systemctl daemon-reload
@@ -308,10 +305,7 @@ case $1 in
             configure_opensearch_dashboards_certificates
             configure_journalbeat_certificates
             configure_grafana
-<<<<<<< HEAD
             configure_prometheus
-=======
->>>>>>> 0282911 (Initial commit)
             restart_services
             sleep 5
             echo "Creating OpenSearch index patterns and initial index..."