Merge branch 'pr/140'
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/490a191b Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/490a191b Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/490a191b Branch: refs/heads/master Commit: 490a191bc2367bcfba6ad65f2acd678dd9c9bdca Parents: 8ae2401 a7974ca Author: Jean-Louis Monteiro <jeano...@gmail.com> Authored: Fri Aug 3 22:08:23 2018 +0200 Committer: Jean-Louis Monteiro <jeano...@gmail.com> Committed: Fri Aug 3 22:08:23 2018 +0200 ---------------------------------------------------------------------- assembly/openejb-standalone/src/main/conf/README.txt | 2 +- .../src/main/java/org/apache/openejb/test/CorbaTestServer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------