Projects >> Java-WebSocket >>aeb04e5d970bbfeb8a8493e716efde0a11ec4087

Chunk
Conflicting content 
import java.net.Socket;
import java.net.URI;
import java.nio.ByteBuffer;
<<<<<<< HEAD
import java.nio.channels.ByteChannel;
import java.nio.channels.ClosedByInterruptException;
import java.nio.channels.NotYetConnectedException;
import java.nio.channels.SelectionKey;
import java.nio.channels.Selector;
import java.nio.channels.SocketChannel;
import java.nio.channels.UnresolvedAddressException;
=======
import java.nio.channels.*;
>>>>>>> 710eefde0188dc64dc25c6c51d6b1253912ce864
import java.util.Iterator;
import java.util.List;
import java.util.Map;
Solution content 
import java.net.Socket;
import java.net.URI;
import java.nio.ByteBuffer;
import java.nio.channels.ByteChannel;
import java.nio.channels.ClosedByInterruptException;
import java.nio.channels.NotYetConnectedException;
import java.nio.channels.SelectionKey;
import java.nio.channels.Selector;
import java.nio.channels.SocketChannel;
import java.nio.channels.UnresolvedAddressException;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
File
WebSocketClient.java
Developer's decision
Version 1
Kind of conflict
Import