fix conflict 1.32.x

spinnaker · Aug 8, 2024 · 0b67c67 · 0b67c67
1 parent 04cb709
commit 0b67c67
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/...iver/src/main/java/com/netflix/kayenta/stackdriver/metrics/StackdriverMetricsService.java b/...iver/src/main/java/com/netflix/kayenta/stackdriver/metrics/StackdriverMetricsService.java
@@ -399,12 +399,6 @@ public List<MetricSet> queryMetrics(
               : stackdriverCanaryScope.getEnd();
 
       // TODO(duftler): What if there are no data points?
-<<<<<<< HEAD
-      List<Double> pointValues =
-          points.stream()
-              .map(point -> point.getValue().getDoubleValue())
-              .collect(Collectors.toList());
-=======
       List<Double> pointValues;
 
       if (points.isEmpty()) {
@@ -436,7 +430,6 @@ public List<MetricSet> queryMetrics(
           pointValues = Collections.emptyList(); // Handle null valueType case as well
         }
       }
->>>>>>> 6684f9dd (fix(stackdriver): handle null timeSeries and empty points (#1047))
 
       MetricSet.MetricSetBuilder metricSetBuilder =
           MetricSet.builder()