518bda7a43
Conflicts: .gitignore hibernate-enhance-maven-plugin/src/main/resources/META-INF/maven/plugin.xml hibernate-enhance-maven-plugin/src/main/resources/META-INF/maven/plugin.xml.original tooling/hibernate-enhance-maven-plugin/src/main/resources/META-INF/maven/plugin.xml |
||
---|---|---|
.. | ||
java/org/hibernate/bytecode/enhance/plugins | ||
resources/META-INF/maven |