fix merge conflict
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/8d4badff Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/8d4badff Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/8d4badff Branch: refs/heads/master Commit: 8d4badffd5896e41d010be2f88d9d76886bb302e Parents: 4bc58e9 Author: Hayri Cicek <[email protected]> Authored: Tue Dec 4 17:54:55 2018 +0100 Committer: Hayri Cicek <[email protected]> Committed: Tue Dec 4 17:54:55 2018 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/openejb/server/DiscoveryAgent.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/8d4badff/server/openejb-server/src/main/java/org/apache/openejb/server/DiscoveryAgent.java ---------------------------------------------------------------------- diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/DiscoveryAgent.java b/server/openejb-server/src/main/java/org/apache/openejb/server/DiscoveryAgent.java index 6aa04d2..83e09c5 100644 --- a/server/openejb-server/src/main/java/org/apache/openejb/server/DiscoveryAgent.java +++ b/server/openejb-server/src/main/java/org/apache/openejb/server/DiscoveryAgent.java @@ -34,7 +34,7 @@ public interface DiscoveryAgent { * register a service * * @param serviceUri - * @throws java.io.IOException + * @throws IOException */ void registerService(URI serviceUri) throws IOException; @@ -42,7 +42,7 @@ public interface DiscoveryAgent { * register a service * * @param serviceUri - * @throws java.io.IOException + * @throws IOException */ void unregisterService(URI serviceUri) throws IOException;
