Fix conflicts

This commit is contained in:
Quentin Guidée
2020-02-17 17:10:32 +01:00
109 changed files with 340 additions and 82 deletions

View File

@@ -39,6 +39,7 @@ public:
void didBecomeFirstResponder() override;
bool handleEvent(Ion::Events::Event event) override;
ViewController::DisplayParameter displayParameter() override { return ViewController::DisplayParameter::WantsMaximumSpace; }
TELEMETRY_ID("Console");
// ListViewDataSource
int numberOfRows() const override;