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 /jdisc_core/src/test/java/com/yahoo/jdisc/core/OsgiLogServiceTestCase.java | |
| parent | 4253ef45bdb7c6f6084134ab4f0e2174eea6f40a (diff) | |
| parent | 9e63438157c0659f9382324b5a83cb6a020018e1 (diff) | |
Fixed merge conflict with StatusPageProxyHandler
Diffstat (limited to 'jdisc_core/src/test/java/com/yahoo/jdisc/core/OsgiLogServiceTestCase.java')
| -rw-r--r-- | jdisc_core/src/test/java/com/yahoo/jdisc/core/OsgiLogServiceTestCase.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/core/OsgiLogServiceTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/core/OsgiLogServiceTestCase.java index 50d9800d752..1434ca1b704 100644 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/core/OsgiLogServiceTestCase.java +++ b/jdisc_core/src/test/java/com/yahoo/jdisc/core/OsgiLogServiceTestCase.java @@ -15,7 +15,7 @@ import static org.junit.Assert.fail; /** - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen Hult</a> + * @author Simon Thoresen Hult */ public class OsgiLogServiceTestCase { |