Fixed some conflicts

This commit is contained in:
Quentin Guidée
2020-02-12 17:42:58 +01:00
687 changed files with 13048 additions and 4057 deletions

View File

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