mirror of
https://github.com/UpsilonNumworks/Upsilon.git
synced 2026-01-18 16:27:34 +01:00
Fixed some conflicts
This commit is contained in:
@@ -37,7 +37,7 @@ private:
|
||||
private:
|
||||
int numberOfSubviews() const override;
|
||||
View * subviewAtIndex(int index) override;
|
||||
void layoutSubviews() override;
|
||||
void layoutSubviews(bool force = false) override;
|
||||
SelectableTableView m_selectableTableView;
|
||||
};
|
||||
static constexpr KDCoordinate k_sideMargin = 4;
|
||||
|
||||
Reference in New Issue
Block a user