Format

Signed-off-by: Sayali Gaikawad <[email protected]>
opensearch-project · Oct 29, 2024 · 0a64a82 · 0a64a82
1 parent 3f57106
commit 0a64a82
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git 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
@@ -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;