diff options
author | Greg Wilkins | 2016-02-04 06:00:39 +0000 |
---|---|---|
committer | Greg Wilkins | 2016-02-04 06:00:39 +0000 |
commit | bb89e113a9fdd68bcf4b1c9362e40d370aac5fa6 (patch) | |
tree | 39fecd0a84269bd197ee07152588a06d7b00cafd | |
parent | df79ad689a38592472d3696e15bf0252e617b8e7 (diff) | |
download | org.eclipse.jetty.project-bb89e113a9fdd68bcf4b1c9362e40d370aac5fa6.tar.gz org.eclipse.jetty.project-bb89e113a9fdd68bcf4b1c9362e40d370aac5fa6.tar.xz org.eclipse.jetty.project-bb89e113a9fdd68bcf4b1c9362e40d370aac5fa6.zip |
fixed merge
-rw-r--r-- | jetty-servlet/src/test/java/org/eclipse/jetty/servlet/RequestGetPartsTest.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/RequestGetPartsTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/RequestGetPartsTest.java index 9cc62c6094..55de8d851f 100644 --- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/RequestGetPartsTest.java +++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/RequestGetPartsTest.java @@ -15,6 +15,7 @@ // You may elect to redistribute this code under either of these licenses. // ======================================================================== // + package org.eclipse.jetty.servlet; import static org.hamcrest.Matchers.containsString; |