d3b7b9b717
Conflicts: hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiJtaPlatform.java |
||
---|---|---|
.. | ||
src/main/java/org/hibernate/osgi | ||
hibernate-osgi.gradle |
d3b7b9b717
Conflicts: hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiJtaPlatform.java |
||
---|---|---|
.. | ||
src/main/java/org/hibernate/osgi | ||
hibernate-osgi.gradle |