github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bad merge output

Browse Source
This commit is contained in:
lukaseder 2017-06-09 22:12:34 +02:00
parent 7860fd302a
commit 18ccbc006b
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jOOQ-manual/src/main/resources/org/jooq/web/manual-3.10.xml
View File

@ -17905,11 +17905,7 @@ CREATE TABLE book_to_book_store (
</section>
<section id="xmlgenerator">
<<<<<<< HEAD
<title>XMLGenerator: Generating XML</title>
=======
<title>Generating XML</title>
>>>>>>> branch 'master' of https://lukaseder@bitbucket.org/lukaseder/jooq-website.git
<content><html>
<p>
By default the code generator produces Java files for use with the jOOQ API as documented throughout this manual. In some cases, however, it may be desireable to generate other meta data formats, such as an XML document. This can be done with the <code>XMLGenerator</code>.