Projects >> findbugs4junit >>786a5378ef4fd2dc7409e892a93571c8a34bb555

Chunk
Conflicting content 
package com.youdevise.fbplugins.junit;

<<<<<<< HEAD
import static org.hamcrest.core.IsCollectionContaining.hasItem;
=======
import static java.util.Arrays.asList;
>>>>>>> 483f3b80fb2085d4739bcff9697376aa0b0b7874
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.collection.IsCollectionContaining.hasItem;
Solution content 
package com.youdevise.fbplugins.junit;

import static java.util.Arrays.asList;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.collection.IsCollectionContaining.hasItem;
File
JUnitClassVisitorTest.java
Developer's decision
Version 2
Kind of conflict
Import