From 78b38cc75f3d75277066ffe94de66a885b353802 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Fri, 23 Feb 2024 16:21:28 +0000
Subject: [PATCH] Fix merge conflict.

---
 pcbnew/dialogs/dialog_track_via_properties_base.cpp | 1 -
 pcbnew/dialogs/dialog_track_via_properties_base.fbp | 2 +-
 pcbnew/dialogs/dialog_track_via_properties_base.h   | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pcbnew/dialogs/dialog_track_via_properties_base.cpp b/pcbnew/dialogs/dialog_track_via_properties_base.cpp
index 1d30535d87..ede754856c 100644
--- a/pcbnew/dialogs/dialog_track_via_properties_base.cpp
+++ b/pcbnew/dialogs/dialog_track_via_properties_base.cpp
@@ -377,7 +377,6 @@ DIALOG_TRACK_VIA_PROPERTIES_BASE::DIALOG_TRACK_VIA_PROPERTIES_BASE( wxWindow* pa
 	m_cbTeardrops = new wxCheckBox( m_sbViaSizer->GetStaticBox(), wxID_ANY, _("Add teardrops on via's track connections"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE );
 	bSizerLeftCol11->Add( m_cbTeardrops, 0, wxBOTTOM|wxRIGHT, 3 );
 
-	wxCheckBox* m_cbTeardropsUseNextTrack;
 	m_cbTeardropsUseNextTrack = new wxCheckBox( m_sbViaSizer->GetStaticBox(), wxID_ANY, _("Allow teardrops to span two track segments"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE );
 	m_cbTeardropsUseNextTrack->SetToolTip( _("Allows a teardrop to extend over the first 2 connected track segments if the first track segment is too short to accommodate the best length.") );
 
diff --git a/pcbnew/dialogs/dialog_track_via_properties_base.fbp b/pcbnew/dialogs/dialog_track_via_properties_base.fbp
index ec457fbe24..c1f0d9e0d8 100644
--- a/pcbnew/dialogs/dialog_track_via_properties_base.fbp
+++ b/pcbnew/dialogs/dialog_track_via_properties_base.fbp
@@ -3815,7 +3815,7 @@
                             <property name="pane_border">1</property>
                             <property name="pane_position"></property>
                             <property name="pane_size"></property>
-                            <property name="permission">none</property>
+                            <property name="permission">protected</property>
                             <property name="pin_button">1</property>
                             <property name="pos"></property>
                             <property name="resize">Resizable</property>
diff --git a/pcbnew/dialogs/dialog_track_via_properties_base.h b/pcbnew/dialogs/dialog_track_via_properties_base.h
index ea8e1f4b6d..4eb5e7d5e6 100644
--- a/pcbnew/dialogs/dialog_track_via_properties_base.h
+++ b/pcbnew/dialogs/dialog_track_via_properties_base.h
@@ -110,6 +110,7 @@ class DIALOG_TRACK_VIA_PROPERTIES_BASE : public DIALOG_SHIM
 		wxStaticText* m_staticText85;
 		wxStaticText* m_staticText851;
 		wxCheckBox* m_cbTeardrops;
+		wxCheckBox* m_cbTeardropsUseNextTrack;
 		wxStaticText* m_stHDRatio;
 		wxTextCtrl* m_tcHDRatio;
 		wxStaticText* m_stHDRatioUnits;