| Chunk |
|---|
| Conflicting content |
|---|
import com.corundumstudio.socketio.listener.DataListener;
import com.corundumstudio.socketio.listener.DisconnectListener;
import com.corundumstudio.socketio.parser.JsonSupport;
<<<<<<< HEAD
import com.corundumstudio.socketio.transport.NamespaceClient;
import com.corundumstudio.socketio.utils.ConcurrentHashSet;
=======
>>>>>>> e797a715fffed6621cb25e781922c7b1459889f9
public class Namespace implements SocketIONamespace {
|
| Solution content |
|---|
import com.corundumstudio.socketio.listener.DataListener;
import com.corundumstudio.socketio.listener.DisconnectListener;
import com.corundumstudio.socketio.parser.JsonSupport;
import com.corundumstudio.socketio.transport.NamespaceClient;
import com.corundumstudio.socketio.utils.ConcurrentHashSet;
public class Namespace implements SocketIONamespace {
|
| File |
|---|
| Namespace.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |