Projects >> pangool >>9ab9135a33ee43093141e755fba31b7b5ff5957e

Chunk
Conflicting content 
import org.apache.hadoop.mapreduce.lib.output.TextOutputFormat;
import org.junit.Test;

<<<<<<< HEAD
=======
import com.datasalt.pangool.cogroup.TupleMRBuilder;
import com.datasalt.pangool.cogroup.TupleMRException;
import com.datasalt.pangool.cogroup.processors.IdentityTupleReducer;
import com.datasalt.pangool.cogroup.processors.IdentityTupleMapper;
import com.datasalt.pangool.cogroup.processors.TupleMapper;
import com.datasalt.pangool.cogroup.processors.TupleReducer;
import com.datasalt.pangool.cogroup.sorting.Criteria.Order;
import com.datasalt.pangool.cogroup.sorting.SortBy;
>>>>>>> eb17ffef8535e1d92ae11484c9b106219d903753
import com.datasalt.pangool.io.tuple.ITuple;
import com.datasalt.pangool.io.tuple.Schema;
import com.datasalt.pangool.io.tuple.Schema.Field;
Solution content 
import org.apache.hadoop.mapreduce.lib.output.TextOutputFormat;
import org.junit.Test;

import com.datasalt.pangool.io.tuple.ITuple;
import com.datasalt.pangool.io.tuple.Schema;
import com.datasalt.pangool.io.tuple.Schema.Field;
File
TestTupleInputOutputFormat.java
Developer's decision
Version 1
Kind of conflict
Import