e9e29a40be
Conflicts: hibernate-entitymanager/src/main/java/org/hibernate/ejb/Ejb3Configuration.java hibernate-entitymanager/src/main/java/org/hibernate/ejb/HibernatePersistence.java hibernate-osgi/src/main/java/org/hibernate/osgi/HibernateBundleActivator.java |
||
---|---|---|
.. | ||
src/main/java/org/hibernate/osgi | ||
hibernate-osgi.gradle |