[Fix] Conflicts

This commit is contained in:
Quentin
2020-04-16 14:04:56 +02:00
335 changed files with 2110 additions and 1685 deletions

View File

@@ -23,8 +23,8 @@ public:
/* AlternateEmptyViewDefaultDelegate */
bool isEmpty() const override;
virtual I18n::Message emptyMessage() override;
virtual Responder * defaultController() override;
I18n::Message emptyMessage() override;
Responder * defaultController() override;
/* TableViewDataSource */
int numberOfRows() const override;
int numberOfColumns() const override { return 2; }