Projects >> squall >>458057f2c8af053057a7d940a22e7d836bf3deef

Chunk
Conflicting content 
import java.util.Map.Entry;
import java.util.TreeMap;

<<<<<<< HEAD
import ch.epfl.data.squall.storm_components.stream_grouping.HyperCubeStaticGrouping;
=======
import ch.epfl.data.squall.storm_components.hyper_cube.stream_grouping.HyperCubeGrouping;
>>>>>>> fdc0a3653be1297e78de6945beb22c63c650bdcf
import ch.epfl.data.squall.thetajoin.matrix_assignment.HyperCubeAssignment;
import org.apache.log4j.Logger;
Solution content 
import java.util.Map.Entry;
import java.util.TreeMap;

import ch.epfl.data.squall.storm_components.hyper_cube.stream_grouping.HyperCubeGrouping;
import ch.epfl.data.squall.thetajoin.matrix_assignment.HyperCubeAssignment;
import org.apache.log4j.Logger;
File
MyUtilities.java
Developer's decision
Version 2
Kind of conflict
Import