Projects >> evrythng-java-sdk >>5094706554775c4de3d490e3b8acf33bed2a0edb

Chunk
Conflicting content
	private static final long serialVersionUID = -2064399431964890923L;
	private String name;
	private String description;
<<<<<<< HEAD
	private String type;
	/**
	 * Collection of {@link Thng#id} references.
	 */
	private LinkedHashSet thngs;
=======
>>>>>>> ea643f6a4b42b3c499a0d6b11b9f658ea9c89bf2

	public String getName() {
Solution content
	private static final long serialVersionUID = -2064399431964890923L;
	private String name;
	private String description;
	private String type;
	/**
	 * Collection of {@link Thng#id} references.
	 */
	private LinkedHashSet thngs;

	public String getName() {
File
Collection.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Chunk
Conflicting content
		this.description = description;
	}

<<<<<<< HEAD
	public String getType() {

		return type;
	}

	public void setType(final String type) {

		this.type = type;
	}

	public LinkedHashSet getThngs() {

		return thngs;
	}

	public void setThngs(final LinkedHashSet thngs) {

		this.thngs = thngs;
	}

	@Override
	public String toString() {

		return "Collection{" + "name='" + name + "\'" + ", description='" + description + "\'" + ", type=" + type + "} + , thngs=" + thngs + "}";
=======
	@Override
	public String toString() {

		return "Collection{" + "name='" + name + "\'" + ", description='" + description + "\'" + "}";
>>>>>>> ea643f6a4b42b3c499a0d6b11b9f658ea9c89bf2
	}
}
Solution content
		this.description = description;
	}

	public String getType() {

		return type;
	}

	public void setType(final String type) {

		this.type = type;
	}

	public LinkedHashSet getThngs() {

		return thngs;
	}

	public void setThngs(final LinkedHashSet thngs) {

		this.thngs = thngs;
	}

	@Override
	public String toString() {

		return "Collection{" + "name='" + name + "\'" + ", description='" + description + "\'" + ", type=" + type + "} + , thngs=" + thngs + "}";
	}
}
File
Collection.java
Developer's decision
Version 1
Kind of conflict
Annotation
Attribute
Method declaration
Method signature
Return statement