Projects >> structr >>035501f090ab270a53391cadc549f522f7ae24aa

Chunk
Conflicting content
	private static final Logger logger                      = Logger.getLogger(SchemaRelationship.class.getName());
	private static final Pattern ValidKeyPattern            = Pattern.compile("[a-zA-Z_]+");

<<<<<<< HEAD
=======
	public static final Property name             = new StringProperty("name").indexed();
	public static final Property sourceId           = new SourceId("sourceId").passivelyIndexed();
	public static final Property targetId           = new TargetId("targetId").passivelyIndexed();
>>>>>>> 6ae47331a58df7403a7a809979a7f8813a03b514
	public static final Property relationshipType   = new StringProperty("relationshipType");
	public static final Property sourceMultiplicity = new StringProperty("sourceMultiplicity");
	public static final Property targetMultiplicity = new StringProperty("targetMultiplicity");
Solution content
	private static final Logger logger                      = Logger.getLogger(SchemaRelationship.class.getName());
	private static final Pattern ValidKeyPattern            = Pattern.compile("[a-zA-Z_]+");

	public static final Property name             = new StringProperty("name").indexed();
	public static final Property relationshipType   = new StringProperty("relationshipType");
	public static final Property sourceMultiplicity = new StringProperty("sourceMultiplicity");
	public static final Property targetMultiplicity = new StringProperty("targetMultiplicity");
File
SchemaRelationship.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation