From faaae0414db0d31446b437761e1850318312fcd4 Mon Sep 17 00:00:00 2001
From: lukaseder <lukas.eder@gmail.com>
Date: Tue, 17 Feb 2015 09:16:32 +0100
Subject: [PATCH] merge...

---
 jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
index 42cfb67150..17f767df1f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
@@ -1782,10 +1782,7 @@ 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