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/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java | |
| parent | 4253ef45bdb7c6f6084134ab4f0e2174eea6f40a (diff) | |
| parent | 9e63438157c0659f9382324b5a83cb6a020018e1 (diff) | |
Fixed merge conflict with StatusPageProxyHandler
Diffstat (limited to 'container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java')
| -rw-r--r-- | container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java b/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java index afbf163500f..033a5819585 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java @@ -23,7 +23,7 @@ import java.util.Set; * Not for public use. * * If possible, please avoid using this class and HandlersConfigurer in your tests - * @author tonytv + * @author Tony Vaagenes * @author gjoranv * */ |