diff options
| author | Henrik <henrik.hoiness@online.no> | 2018-07-05 13:25:59 +0200 |
|---|---|---|
| committer | Henrik <henrik.hoiness@online.no> | 2018-07-05 13:25:59 +0200 |
| commit | 1c604359c6a432685b6edbb3e721aa9af91a518e (patch) | |
| tree | 4306caf78fc7e94283738d5838f37f36e98351fd /container-core/src/test/java/com/yahoo/container/jdisc/ThreadedRequestHandlerTestCase.java | |
| parent | 4253ef45bdb7c6f6084134ab4f0e2174eea6f40a (diff) | |
| parent | 9e63438157c0659f9382324b5a83cb6a020018e1 (diff) | |
Fixed merge conflict with StatusPageProxyHandler
Diffstat (limited to 'container-core/src/test/java/com/yahoo/container/jdisc/ThreadedRequestHandlerTestCase.java')
| -rw-r--r-- | container-core/src/test/java/com/yahoo/container/jdisc/ThreadedRequestHandlerTestCase.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/ThreadedRequestHandlerTestCase.java b/container-core/src/test/java/com/yahoo/container/jdisc/ThreadedRequestHandlerTestCase.java index 5c2eee228a4..331c536a531 100644 --- a/container-core/src/test/java/com/yahoo/container/jdisc/ThreadedRequestHandlerTestCase.java +++ b/container-core/src/test/java/com/yahoo/container/jdisc/ThreadedRequestHandlerTestCase.java @@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit; import static org.junit.Assert.*; /** - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> + * @author Simon Thoresen Hult */ public class ThreadedRequestHandlerTestCase { |