GUACAMOLE-670: Merge changes correcting conflicting versions of SLF4J.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/a967ffa4 Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/a967ffa4 Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/a967ffa4 Branch: refs/heads/master Commit: a967ffa41c5ffc8c6d5142c51a1419d197bac7a3 Parents: 001ece1 95dfb5e Author: Michael Jumper <mjum...@apache.org> Authored: Mon Dec 3 07:30:23 2018 -0800 Committer: Michael Jumper <mjum...@apache.org> Committed: Mon Dec 3 07:30:23 2018 -0800 ---------------------------------------------------------------------- extensions/guacamole-auth-cas/pom.xml | 7 ++++++- extensions/guacamole-auth-radius/pom.xml | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
