Projects >> cascading >>d030f1b20c3d117a86030c7b100cd4329e53155e

Chunk
Conflicting content 
package cascading;

<<<<<<< HEAD
import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;

=======
import cascading.flow.Flow;
>>>>>>> 5fb7f0ae734d1c82b8556dd71db24755ab375a6a
import cascading.flow.MultiMapReducePlanner;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.dfs.MiniDFSCluster;
Solution content 
package cascading;

import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;

import cascading.flow.MultiMapReducePlanner;
import cascading.flow.Flow;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.dfs.MiniDFSCluster;
File
ClusterTestCase.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.MiniMRCluster;
<<<<<<< HEAD
=======

import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
>>>>>>> 5fb7f0ae734d1c82b8556dd71db24755ab375a6a

/**
 *
Solution content 
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.MiniMRCluster;

/**
 *
File
ClusterTestCase.java
Developer's decision
Version 1
Kind of conflict
Import