Pritam Banerjee 16b6ae9dd1 Merge remote-tracking branch 'upstream/master' ... # Conflicts: # ejb/ejb-client/pom.xml # ejb/ejb-client/src/main/java/com/baeldung/ejb/client/EJBClient.java # ejb/ejb-client/src/main/resources/jboss-ejb-client.properties # ejb/ejb-remote/pom.xml # ejb/ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloWorldBean.java # ejb/pom.xml		2016-11-15 23:22:27 -08:00
..
src/main	Merge remote-tracking branch 'upstream/master'	2016-11-15 23:22:27 -08:00
pom.xml	Merge remote-tracking branch 'upstream/master'	2016-11-15 23:22:27 -08:00