Projects >> hudson >>4c0d5ea6437000b3dd2bf66a6568271712b612fc

Chunk
Conflicting content 
import hudson.remoting.FastPipedInputStream;
import hudson.remoting.FastPipedOutputStream;
<<<<<<< HEAD
=======
import org.codehaus.groovy.runtime.Security218;
import org.junit.Assert;
>>>>>>> 6653b5199e9606712568f8cbfb9b74aab81eb529
import org.junit.Before;
import org.junit.Test;
Solution content 
import hudson.remoting.FastPipedInputStream;
import hudson.remoting.FastPipedOutputStream;
import org.codehaus.groovy.runtime.Security218;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
File
ConnectionTest.java
Developer's decision
Version 2
Kind of conflict
Import