Projects >> imglib2 >>157c35334d50a6cfc912551542ff101a3f1d394f

Chunk
Conflicting content 
package mpicbg.imglib.container;

import mpicbg.imglib.Cursor;
<<<<<<< HEAD
=======
import mpicbg.imglib.Localizable;
import mpicbg.imglib.container.array.Array;
import mpicbg.imglib.container.cell.CellContainer;
import mpicbg.imglib.type.Type;
>>>>>>> 990f26f8c9f3840c3d3b2ee0bf80b0771377c3ca

/**
 * 
The {@link ImgCursor} interface
Solution content 
package mpicbg.imglib.container;

import mpicbg.imglib.Cursor;

/**
 * 
The {@link ImgCursor} interface
File
ImgCursor.java
Developer's decision
Version 1
Kind of conflict
Import