From 1eee3d350be35ec23365e698d8cf216610af3bc9 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Thu, 31 Aug 2023 12:37:19 +0100 Subject: [PATCH] Fix merge errors. --- include/dialogs/dialog_grid_settings.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/include/dialogs/dialog_grid_settings.h b/include/dialogs/dialog_grid_settings.h index e92d792eb2..ef89b92ba5 100644 --- a/include/dialogs/dialog_grid_settings.h +++ b/include/dialogs/dialog_grid_settings.h @@ -42,10 +42,13 @@ private: void RebuildGridSizes(); - UNIT_BINDER m_gridOriginX; - UNIT_BINDER m_gridOriginY; - UNIT_BINDER m_userGridX; - UNIT_BINDER m_userGridY; +private: + EDA_DRAW_FRAME* m_parent; + + UNIT_BINDER m_gridOriginX; + UNIT_BINDER m_gridOriginY; + UNIT_BINDER m_userGridX; + UNIT_BINDER m_userGridY; }; #endif // DIALOG_GRID_SETTINGS_H