Projects >> digipost-api-client-java >>937075ba7d8a81e749b17d1d7f793e802e36c139

Chunk
Conflicting content
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "failed-print-metadata")
<<<<<<< HEAD:src/main/java/no/digipost/api/client/representations/FailedPrintMetadata.java
public class FailedPrintMetadata extends EventMetadata {

	@XmlAttribute(name = "error-code")
	public final String errorCode;
=======
public class PrintFailedMetadata extends EventMetadata {

	@XmlAttribute(name = "error-code")
	public final String errorMessage;
>>>>>>> d4037f80ef63b0e1a67ec0a71c20ff479518b656:src/main/java/no/digipost/api/client/representations/PrintFailedMetadata.java

	public FailedPrintMetadata() {
		this(null);
Solution content
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "failed-print-metadata")
public class FailedPrintMetadata extends EventMetadata {

	@XmlAttribute(name = "error-code")
	public final String errorCode;

	public FailedPrintMetadata() {
		this(null);
File
FailedPrintMetadata.java
Developer's decision
Version 1
Kind of conflict
Annotation
Attribute
Class signature