QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-18 13:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into feature/sprint-19

Browse Source
This commit is contained in:
Tim Chamberlain
2023-01-18 17:36:46 -06:00
parent 22565b3ecd e8264d915f
commit a1674792c6
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/PieChartData.java
View File

@ -43,9 +43,8 @@ public class PieChartData extends ChartData
/******************************************************************************* /*******************************************************************************
** **
*******************************************************************************/ *******************************************************************************/
public PieChartData(String label, String description, String seriesLabel, List<String> labels, List<Number> data) public PieChartData(String description, String seriesLabel, List<String> labels, List<Number> data)
{ {
setLabel(label);
setDescription(description); setDescription(description);
setChartData(new ChartData.Data() setChartData(new ChartData.Data()
.withLabels(labels) .withLabels(labels)

1
qqq-dev-tools/bin/resolve-pom-conflicts.sh
View File

@ -5,3 +5,4 @@
## Tries to automatically resove pom conflicts by putting SNAPSHOT back ## Tries to automatically resove pom conflicts by putting SNAPSHOT back
############################################################################ ############################################################################
gsed -i "/Updated upstream/,/=======/d;/Stashed/d" pom.xml gsed -i "/Updated upstream/,/=======/d;/Stashed/d" pom.xml
git add pom.xml