[Git] Fix conflicts

This commit is contained in:
Quentin
2020-04-01 11:36:16 +02:00
60 changed files with 1568 additions and 223 deletions

View File

@@ -168,6 +168,7 @@ void CalculationController::willDisplayCellAtLocation(HighlightCell * cell, int
myCell->setFirstText(buffer);
buffer[0] = 'Y';
myCell->setSecondText(buffer);
assert(seriesNumber < Palette::numberOfDataColors());
myCell->setColor(Palette::DataColor[seriesNumber]);
return;
}