Projects >> floodlight >>e4f1cffc85a5c306f314b124e67cc2807c27e77f

Chunk
Conflicting content 
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
<<<<<<< HEAD
import java.util.EnumSet;
import java.util.Iterator;
=======
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;

>>>>>>> cdc3e00e445d2ffba2dddbb2c72933b6735fd48e
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.createStrictMock;
import static org.easymock.EasyMock.expect;
Solution content 
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
import java.util.EnumSet;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;

import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.createStrictMock;
import static org.easymock.EasyMock.expect;
File
DeviceManagerImplTest.java
Developer's decision
Combination
Kind of conflict
Import