| Chunk |
|---|
| Conflicting content |
|---|
import org.apache.hadoop.io.NullWritable;
import com.datasalt.pangool.examples.BaseExampleJob;
<<<<<<< HEAD
import com.datasalt.pangool.io.tuple.ITuple;
import com.datasalt.pangool.io.tuple.Schema;
import com.datasalt.pangool.io.tuple.Tuple;
import com.datasalt.pangool.io.tuple.Schema.Field;
import com.datasalt.pangool.io.tuple.Schema.Field.Type;
=======
import com.datasalt.pangool.io.ITuple;
import com.datasalt.pangool.tuplemr.SortBy;
import com.datasalt.pangool.tuplemr.TupleMRBuilder;
import com.datasalt.pangool.tuplemr.TupleMRException;
import com.datasalt.pangool.tuplemr.Criteria.Order;
import com.datasalt.pangool.tuplemr.mapred.tuplemr.IdentityTupleMapper;
import com.datasalt.pangool.tuplemr.mapred.tuplemr.TupleReducer;
>>>>>>> a06fc665d34d2e3028db0190032ab6dcaa7408cf
public class TopicFingerprint extends BaseExampleJob {
|
| Solution content |
|---|
import org.apache.hadoop.io.NullWritable;
import com.datasalt.pangool.examples.BaseExampleJob;
import com.datasalt.pangool.io.ITuple;
import com.datasalt.pangool.io.Schema;
import com.datasalt.pangool.io.Schema.Field;
import com.datasalt.pangool.io.Schema.Field.Type;
import com.datasalt.pangool.io.Tuple;
import com.datasalt.pangool.tuplemr.Criteria.Order;
import com.datasalt.pangool.tuplemr.SortBy;
import com.datasalt.pangool.tuplemr.TupleMRBuilder;
import com.datasalt.pangool.tuplemr.TupleMRException;
import com.datasalt.pangool.tuplemr.mapred.tuplemr.IdentityTupleMapper;
import com.datasalt.pangool.tuplemr.mapred.tuplemr.TupleReducer;
public class TopicFingerprint extends BaseExampleJob {
|
| File |
|---|
| TopicFingerprint.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Import |