Projects >> structr >>00bc2f6ad5f3a9dc1129690cb29621f7f090d37b

Chunk
Conflicting content 
import org.structr.common.PropertyView;
import org.structr.common.SecurityContext;
import org.structr.core.EntityContext;
<<<<<<< HEAD
import org.structr.core.node.NodeService.RelationshipIndex;
=======
>>>>>>> 3af0597dfab7295f14aeae4f3c35872085102ff4

//~--- classes ----------------------------------------------------------------
Solution content 
import org.structr.common.PropertyView;
import org.structr.common.SecurityContext;
import org.structr.core.EntityContext;
import org.structr.core.node.NodeService.RelationshipIndex;

//~--- classes ----------------------------------------------------------------
File
GenericRelationship.java
Developer's decision
Version 1
Kind of conflict
Import