Projects >> BoneJ >>df720a07375c0bf49016632ff2377ec0136137eb

Chunk
Conflicting content 
		}
		
		if(imageAndAnalysisDetails.cOn){
<<<<<<< HEAD
			String[] coHeadings = {"MaMassD [g/cm³]","StratecMaMassD [g/cm³]","MaD [mg/cm³]","MaA [mm²]","CoD [mg/cm³]","CoA [mm²]","Stratec CoD [mg/cm³]","Stratec CoA [mm²]","SSI [mm³]","ToD [mg/cm³]","ToA[mm²]","MeA [mm²]","BSId[g²/cm4]"};
=======
			String[] coHeadings = {"MaMassD [g/cm�]","StratecMaMassD [g/cm�]","MaD [mg/cm�]","MaA [mm�]","CoD [mg/cm�]","CoA [mm�]","Stratec CoD [mg/cm�]","Stratec CoA [mm�]",
				"SSI [mm�]","SSImax [mm�]","SSImin [mm�]",
				"IPo [mm4]","Imax [mm4]","Imin [mm4]",
				"dwIPo [mg/cm]","dwImax [mg/cm]","dwImin [mg/cm]",
				"ToD [mg/cm�]","ToA[mm�]","MeA [mm�]","BSId[g�/cm4]"};
>>>>>>> c815f724138a565e0787203f0524c11cb77fc6b2
			for (int i = 0;i
Solution content 
		}
		
		if(imageAndAnalysisDetails.cOn){
			String[] coHeadings = {"MaMassD [g/cm�]","StratecMaMassD [g/cm�]","MaD [mg/cm�]","MaA [mm�]","CoD [mg/cm�]","CoA [mm�]","Stratec CoD [mg/cm�]","Stratec CoA [mm�]",
				"SSI [mm�]","SSImax [mm�]","SSImin [mm�]",
				"IPo [mm4]","Imax [mm4]","Imin [mm4]",
				"dwIPo [mg/cm]","dwImax [mg/cm]","dwImin [mg/cm]",
				"ToD [mg/cm�]","ToA[mm�]","MeA [mm�]","BSId[g�/cm4]"};
			for (int i = 0;i
File
ResultsWriter.java
Developer's decision
Version 2
Kind of conflict
Array initializer
Variable