From 78ae3d286af16aadcc02f4dcb05e5fea138161a0 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Sun, 20 Feb 2022 21:25:50 +0000
Subject: [PATCH] Fix merge damage.

---
 pcbnew/dialogs/dialog_graphic_item_properties.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pcbnew/dialogs/dialog_graphic_item_properties.cpp b/pcbnew/dialogs/dialog_graphic_item_properties.cpp
index 19cb877636..f27adbdf47 100644
--- a/pcbnew/dialogs/dialog_graphic_item_properties.cpp
+++ b/pcbnew/dialogs/dialog_graphic_item_properties.cpp
@@ -307,7 +307,7 @@ bool DIALOG_GRAPHIC_ITEM_PROPERTIES::TransferDataFromWindow()
     if( !DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::TransferDataFromWindow() )
         return false;
 
-    LAYER_NUM layer = m_LayerSelectionCtrl->GetLayerSelection();
+    int layer = m_LayerSelectionCtrl->GetLayerSelection();
 
     BOARD_COMMIT commit( m_parent );
     commit.Modify( m_item );