Projects >> ProvToolbox >>2eae5648733b32f4893dd9896e21e0b92d07e15e

Chunk
Conflicting content
        List otherAttrs = convertAttributes((HasExtensibility) o);
	ActivityRef a;
	EntityRef e;
<<<<<<< HEAD
	return c.convertUsed(
			c.convert(o.getId()),
			tAttrs, labAttrs, locAttrs, roleAttrs, otherAttrs,
			(((a = o.getActivity()) == null) ? null : c.convert(a.getRef())),
			(((e = o.getEntity()) == null) ? null : c.convert(e.getRef())),
			o.getTime());
=======
	return c.convertUsed(c.convert(o.getId()), tAttrs, 
	                     labAttrs,
	                     locAttrs, roleAttrs,
	                     otherAttrs,
	                     ((a = o.getActivity()) == null) ? null : c
                                     .convert(a.getRef()),
	                     ((e = o.getEntity()) == null) ? null : c.convert(e.getRef()), 
	                     o.getTime());
>>>>>>> 46c1e442824a4f8262a058fe5f0fa2e37437071d
    }

    public Object convert(WasStartedBy o) {
Solution content
        List otherAttrs = convertAttributes((HasExtensibility) o);
	ActivityRef a;
	EntityRef e;
	return c.convertUsed(c.convert(o.getId()), tAttrs, 
	                     labAttrs,
	                     locAttrs, roleAttrs,
	                     otherAttrs,
	                     ((a = o.getActivity()) == null) ? null : c
                                     .convert(a.getRef()),
	                     ((e = o.getEntity()) == null) ? null : c.convert(e.getRef()), 
	                     o.getTime());
    }

    public Object convert(WasStartedBy o) {
File
BeanTraversal.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Return statement