From 18ccbc006bc97259c95acf1f8063f5b19e7b7eb3 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Fri, 9 Jun 2017 22:12:34 +0200 Subject: [PATCH] Fixed bad merge output --- jOOQ-manual/src/main/resources/org/jooq/web/manual-3.10.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.10.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.10.xml index f01a528363..c171ebc4ca 100644 --- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.10.xml +++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.10.xml @@ -17905,11 +17905,7 @@ CREATE TABLE book_to_book_store (
-<<<<<<< HEAD XMLGenerator: Generating XML -======= - Generating XML ->>>>>>> branch 'master' of https://lukaseder@bitbucket.org/lukaseder/jooq-website.git

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 XMLGenerator.