Fix merge errors.

This commit is contained in:
Jeff Young 2023-08-31 12:37:19 +01:00
parent d2d7e630bd
commit 1eee3d350b
1 changed files with 7 additions and 4 deletions

View File

@ -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