fix merge errors

USACE · Jun 5, 2024 · 98745b1 · 98745b1
1 parent 1e5705b
commit 98745b1
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 3 deletions.
diff --git a/cwms-data-api/src/main/java/cwms/cda/data/dto/County.java b/cwms-data-api/src/main/java/cwms/cda/data/dto/County.java
@@ -31,7 +31,6 @@
 import cwms.cda.api.errors.RequiredFieldException;
 import cwms.cda.formatters.Formats;
 import cwms.cda.formatters.annotations.FormattableWith;
-import cwms.cda.formatters.annotations.Formattables;
 import cwms.cda.formatters.json.JsonV2;
 import io.swagger.v3.oas.annotations.media.Schema;
 

diff --git a/cwms-data-api/src/main/java/cwms/cda/data/dto/State.java b/cwms-data-api/src/main/java/cwms/cda/data/dto/State.java
@@ -32,14 +32,12 @@
 import cwms.cda.formatters.Formats;
 import cwms.cda.formatters.annotations.FormattableWith;
 import cwms.cda.formatters.json.JsonV2;
-
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import java.util.ArrayList;
 
 @Schema(description = "A representation of a state")
 @JsonRootName("state")
-@FormattableWith(contentType = Formats.JSON, formatter = JsonV1.class, aliases = {Formats.JSON, Formats.DEFAULT})
 @FormattableWith(contentType = Formats.JSONV2, formatter = JsonV2.class, aliases = {Formats.JSON, Formats.DEFAULT})
 @JsonNaming(PropertyNamingStrategies.KebabCaseStrategy.class)
 public class State implements CwmsDTOBase {