honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

resolve conflicts

This commit is contained in:
Grahame Grieve 2020-10-30 06:48:22 +11:00
parent 02f136d67f 7a668bff52
commit 7b4668d5c8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/model/CliContext.java
View File

@ -254,12 +254,12 @@ public class CliContext {
return this; return this;
} }
@JsonProperty("output") @JsonProperty("htmlOutput")
public String getHtmlOutput() { public String getHtmlOutput() {
return htmlOutput; return htmlOutput;
} }
@JsonProperty("output") @JsonProperty("htmlOutput")
public CliContext setHtmlOutput(String htmlOutput) { public CliContext setHtmlOutput(String htmlOutput) {
this.htmlOutput = htmlOutput; this.htmlOutput = htmlOutput;
return this; return this;