Projects >> elephant-bird >>1319fe5a3a9951e332f6dd233ca68926b96e39d6

Chunk
Conflicting content 
package com.twitter.elephantbird.mapreduce.io;

<<<<<<< HEAD
import com.twitter.elephantbird.thrift.ThriftBinaryDeserializer;
=======
>>>>>>> c1ca987947541b52ef0448bcd99b1901d777fabf
import org.apache.thrift.TBase;
import org.apache.thrift.TDeserializer;
import org.apache.thrift.TException;
Solution content 
package com.twitter.elephantbird.mapreduce.io;

import com.twitter.elephantbird.thrift.ThriftBinaryDeserializer;
import org.apache.thrift.TBase;
import org.apache.thrift.TDeserializer;
import org.apache.thrift.TException;
File
ThriftConverter.java
Developer's decision
Version 1
Kind of conflict
Import