Fix conflicts

This commit is contained in:
MrSluffy authored and Goooler committed 2024-01-08 16:03:01 +08:00
1 parent 3269857e66
commit 32922a2e02
25 files changed
+39 -358

No files matched your search

@@ -593,12 +593,7 @@ public class StatsLogManager implements ResourceBasedOverride {
default StatsLogger withCardinality(int cardinality) {
return this;
}
/**
* Sets the input type of the log message.
*/
default StatsLogger withInputType(int inputType) {
return this;
}
/**
* Sets the input type of the log message.
*/