From 0a64a820fa01154a4779356f77f09e2fa906ae15 Mon Sep 17 00:00:00 2001 From: Sayali Gaikawad Date: Tue, 29 Oct 2024 15:12:27 -0700 Subject: [PATCH] Format Signed-off-by: Sayali Gaikawad --- .../org/opensearchmetrics/metrics/release/ReleaseMetrics.java | 3 --- .../metrics/release/ReleaseVersionIncrementChecker.java | 3 --- 2 files changed, 6 deletions(-) diff --git a/src/main/java/org/opensearchmetrics/metrics/release/ReleaseMetrics.java b/src/main/java/org/opensearchmetrics/metrics/release/ReleaseMetrics.java index 644b0aa..762821b 100644 --- a/src/main/java/org/opensearchmetrics/metrics/release/ReleaseMetrics.java +++ b/src/main/java/org/opensearchmetrics/metrics/release/ReleaseMetrics.java @@ -6,10 +6,7 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -<<<<<<< HEAD -======= ->>>>>>> cf2adf2 (Add license checker and missing license headers) package org.opensearchmetrics.metrics.release; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/main/java/org/opensearchmetrics/metrics/release/ReleaseVersionIncrementChecker.java b/src/main/java/org/opensearchmetrics/metrics/release/ReleaseVersionIncrementChecker.java index cf98d8e..dddb9e5 100644 --- a/src/main/java/org/opensearchmetrics/metrics/release/ReleaseVersionIncrementChecker.java +++ b/src/main/java/org/opensearchmetrics/metrics/release/ReleaseVersionIncrementChecker.java @@ -6,10 +6,7 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -<<<<<<< HEAD -======= ->>>>>>> cf2adf2 (Add license checker and missing license headers) package org.opensearchmetrics.metrics.release; import com.fasterxml.jackson.databind.ObjectMapper;