From ab682567c69a4788524ae0ab605a62473283cce5 Mon Sep 17 00:00:00 2001
From: AdenKoperczak <awkoperczak@gmail.com>
Date: Mon, 3 Mar 2025 10:24:41 -0500
Subject: [PATCH] Fix merge conflict during rebasing of rework_layer_text

---
 scwx-qt/source/scwx/qt/map/map_context.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/scwx-qt/source/scwx/qt/map/map_context.cpp b/scwx-qt/source/scwx/qt/map/map_context.cpp
index 7c0683d4..46c2b6fa 100644
--- a/scwx-qt/source/scwx/qt/map/map_context.cpp
+++ b/scwx-qt/source/scwx/qt/map/map_context.cpp
@@ -111,19 +111,11 @@ int16_t MapContext::radar_product_code() const
    return p->radarProductCode_;
 }
 
-<<<<<<< HEAD
-=======
-QMapLibre::CustomLayerRenderParameters MapContext::render_parameters() const
-{
-   return p->renderParameters_;
-}
-
 QWidget* MapContext::widget() const
 {
    return p->widget_;
 }
 
->>>>>>> 513a41d3 (Inital code for per map layer ImGui contexts)
 void MapContext::set_map(const std::shared_ptr<QMapLibre::Map>& map)
 {
    p->map_ = map;