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

@@ -21,6 +21,7 @@ public:
bool handleEvent(Ion::Events::Event event) override;
void viewWillAppear() override;
void didBecomeFirstResponder() override;
TELEMETRY_ID("ScriptParameter");
/* SimpleListViewDataSource */
KDCoordinate cellHeight() override { return Metric::ParameterCellHeight; }