Projects >> hipi >>aec05a5c07c8d631cfdb013ed9c4ea61b8904057

Chunk
Conflicting content 
import org.bytedeco.javacpp.opencv_core;
import org.bytedeco.javacpp.opencv_core.Mat;
import org.bytedeco.javacpp.opencv_core.Scalar;
<<<<<<< HEAD:tools/covar/src/main/java/org/hipi/tools/covar/CovarianceReducer.java

import java.io.IOException;

public class CovarianceReducer extends
    Reducer {
=======

import java.io.IOException;

public class CovarianceReducer extends
    Reducer {
>>>>>>> 4423e1833db81ee99390af2bd7d0763487962fe2:examples/covar/src/main/java/org/hipi/examples/covar/CovarianceReducer.java
  
  @Override
  public void reduce(IntWritable key, Iterable values, Context context)
Solution content 
import org.bytedeco.javacpp.opencv_core;
import org.bytedeco.javacpp.opencv_core.Mat;
import org.bytedeco.javacpp.opencv_core.Scalar;
<<<<<<< HEAD:tools/covar/src/main/java/org/hipi/tools/covar/CovarianceReducer.java

import java.io.IOException;

public class CovarianceReducer extends
    Reducer {
=======

import java.io.IOException;

public class CovarianceReducer extends
    Reducer {
  
  @Override
  public void reduce(IntWritable key, Iterable values, Context context)
File
CovarianceReducer.java
Developer's decision
Manual
Kind of conflict
Class signature
Import