Projects >> BoneJ >>dee47b03e16dc157d3d94c2884cfbfbb9996d87b

Chunk
Conflicting content 
	/**
	 * branch
	 */
<<<<<<< HEAD
	public static final String branch = "-ellipsoid-factor";
=======
	public static final String branch = "";
>>>>>>> 3104b7a18a5c74ba14fbd2789617349bb9a27e24
	
	/**
	 * BoneJ version
Solution content 
	/**
	 * branch
	 */
	public static final String branch = "-ellipsoid-factor";
	
	/**
	 * BoneJ version
File
Help.java
Developer's decision
Version 1
Kind of conflict
Attribute