resolve conflicts

2020-10-30 06:48:22 +11:00 · 2020-10-30 06:48:22 +11:00 · 7b4668d5c8
parent 02f136d67f 7a668bff52
commit 7b4668d5c8
1 changed files with 2 additions and 2 deletions
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/model/CliContext.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/model/CliContext.java
@ -254,12 +254,12 @@ public class CliContext {
    return this;
  }

-  @JsonProperty("output")
+  @JsonProperty("htmlOutput")
  public String getHtmlOutput() {
    return htmlOutput;
  }

-  @JsonProperty("output")
+  @JsonProperty("htmlOutput")
  public CliContext setHtmlOutput(String htmlOutput) {
    this.htmlOutput = htmlOutput;
    return this;