Merge branch 'master' of https://github.com/jOOQ/jOOQ

Conflicts: jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
2015-02-17 09:15:02 +01:00 · 2015-02-17 09:15:02 +01:00 · 5e77bb50d5
commit 5e77bb50d5
parent 0616fefee3 0c10d02ede
1 changed files with 3 additions and 0 deletions
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
@ -1782,7 +1782,10 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
                Field<BigInteger> field = field("lastval()", BigInteger.class);
                return select(field).fetchOne(field);
            }
+<<<<<<< HEAD

+=======
+>>>>>>> 0c10d02ede2e596135170aeaf5db1a64f8a8104e
            /* [pro] xx
            xxxx xxxxxxxxx x
                xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxx xxxx xxxxxxxxx xxxxx xxxxx x xxxx xxxxxxxxxxxxxxxxxx