Projects >> pangool >>823aac5aa7711ef0252817f68caf2b522ca7c4de

Chunk
Conflicting content 
<<<<<<< HEAD
import org.apache.hadoop.io.serializer.Serialization;
import org.apache.hadoop.io.serializer.Serializer;

=======
import com.datasalt.pangolin.grouper.io.tuple.ITuple.InvalidFieldException;
>>>>>>> a9e2873a150f75dba1520cfb3c274adf5a36d543
import com.datasalt.pangool.CoGrouperException;
import com.datasalt.pangool.PangoolConfig;
import com.datasalt.pangool.PangoolConfigBuilder;
Solution content 
import org.apache.hadoop.io.serializer.Serialization;
import org.apache.hadoop.io.serializer.Serializer;


import com.datasalt.pangolin.grouper.io.tuple.ITuple.InvalidFieldException;
import com.datasalt.pangool.CoGrouperException;
import com.datasalt.pangool.PangoolConfig;
import com.datasalt.pangool.PangoolConfigBuilder;
File
SourcedTupleSerialization.java
Developer's decision
Version 2
Kind of conflict
Import