279dff381c
Conflicts: jetty-osgi/pom.xml jetty-server/src/main/java/org/eclipse/jetty/server/Response.java jetty-servlets/pom.xml tests/test-webapps/test-jetty-webapp/pom.xml |
||
---|---|---|
.. | ||
src | ||
pom.xml |
279dff381c
Conflicts: jetty-osgi/pom.xml jetty-server/src/main/java/org/eclipse/jetty/server/Response.java jetty-servlets/pom.xml tests/test-webapps/test-jetty-webapp/pom.xml |
||
---|---|---|
.. | ||
src | ||
pom.xml |