acafe63ead
Conflicts: hibernate-osgi/src/main/java/org/hibernate/osgi/HibernateBundleActivator.java hibernate-osgi/src/test/java/org/hibernate/osgi/test/OsgiTestCase.java |
||
---|---|---|
.. | ||
src/main/java/org/hibernate/osgi | ||
hibernate-osgi.gradle |