| Chunk |
|---|
| Conflicting content |
|---|
public final static String BROADCAST_FILTER_CLASSES = "org.atmosphere.cpr.broadcastFilterClasses";
public final static String DROP_ACCESS_CONTROL_ALLOW_ORIGIN_HEADER = "org.atmosphere.cpr.dropAccessControlAllowOriginHeader";
public final static String NO_CACHE_HEADERS = "org.atmosphere.cpr.noCacheHeaders";
<<<<<<< HEAD
=======
public final static String DROP_ACCESS_CONTROL_ALLOW_ORIGIN_HEADER = "org.atmosphere.cpr.dropAccessControlAllowOriginHeader";
>>>>>>> 1e2e2fbddb521be2f50ee15304370518b6978985
public final static String CONTAINER_RESPONSE = "org.atmosphere.jersey.containerResponse";
public final static String BROADCASTER_LIFECYCLE_POLICY = "org.atmosphere.cpr.broadcasterLifeCyclePolicy";
|
| Solution content |
|---|
public final static String BROADCAST_FILTER_CLASSES = "org.atmosphere.cpr.broadcastFilterClasses";
public final static String NO_CACHE_HEADERS = "org.atmosphere.cpr.noCacheHeaders";
public final static String DROP_ACCESS_CONTROL_ALLOW_ORIGIN_HEADER = "org.atmosphere.cpr.dropAccessControlAllowOriginHeader";
public final static String CONTAINER_RESPONSE = "org.atmosphere.jersey.containerResponse";
public final static String BROADCASTER_LIFECYCLE_POLICY = "org.atmosphere.cpr.broadcasterLifeCyclePolicy";
|
| File |
|---|
| AtmosphereServlet.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |