Projects information

Chunk

Conflicting content
package org.doube.bonej.particleanalyser.impl; /** <<<<<<< HEAD:src/org/doube/bonej/particleanalyser/impl/ParticleCounter.java * ParticleCounter Copyright 2009 2010 Michael Doube * Modified by Keith Schulze 2010 ======= * ParticleCounter Copyright 2009 2010 2011 Michael Doube >>>>>>> c2e3566844aa6ce34239c9b4bf39f9e90c88f43b:src/org/doube/bonej/ParticleCounter.java * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by

Conflicting content

package org.doube.bonej.particleanalyser.impl;

/**
<<<<<<< HEAD:src/org/doube/bonej/particleanalyser/impl/ParticleCounter.java
 * ParticleCounter Copyright 2009 2010 Michael Doube
 * Modified by Keith Schulze 2010
=======
 * ParticleCounter Copyright 2009 2010 2011 Michael Doube
>>>>>>> c2e3566844aa6ce34239c9b4bf39f9e90c88f43b:src/org/doube/bonej/ParticleCounter.java
 * 
 *  This program is free software: you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by

Solution content
package org.doube.bonej.particleanalyser.impl; /** * ParticleCounter Copyright 2009 2010 Michael Doube * Modified by Keith Schulze 2010 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by

Solution content

package org.doube.bonej.particleanalyser.impl;

/**
 * ParticleCounter Copyright 2009 2010 Michael Doube
 * Modified by Keith Schulze 2010
 * 
 *  This program is free software: you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by

File
ParticleCounter.java

Developer's decision
Version 1

Kind of conflict
Comment

Projects >> BoneJ >>38aa43de228210c9759a435c756931267b4aff17