From 4764094e4a66b4517cde88bd7a52debf5ad80cd1 Mon Sep 17 00:00:00 2001
From: Andrew Hutchings <andrew@linuxjedi.co.uk>
Date: Thu, 31 May 2018 15:04:04 +0100
Subject: [PATCH] Fix merge errors

---
 dbcon/ddlpackage/ddl.y            | 3 ++-
 writeengine/splitter/we_cmdargs.h | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dbcon/ddlpackage/ddl.y b/dbcon/ddlpackage/ddl.y
index b143895b9..e45df1289 100644
--- a/dbcon/ddlpackage/ddl.y
+++ b/dbcon/ddlpackage/ddl.y
@@ -198,6 +198,7 @@ VARYING WITH ZONE DOUBLE IDB_FLOAT REAL CHARSET IDB_IF EXISTS CHANGE TRUNCATE
 %type <str>                  opt_if_not_exists
 %type <sqlStmt>              trunc_table_statement
 %type <sqlStmt>              rename_table_statement
+%type <str>                  ident
 
 %%
 stmtblock:	stmtmulti { x->fParseTree = $1; }
@@ -615,7 +616,7 @@ table_name:
 	;
 
 qualified_name:
-	| ident {
+	ident {
 				if (x->fDBSchema.size())
 					$$ = new QualifiedName((char*)x->fDBSchema.c_str(), $1);
 				else
diff --git a/writeengine/splitter/we_cmdargs.h b/writeengine/splitter/we_cmdargs.h
index edaa4cdd1..3186fe6c0 100644
--- a/writeengine/splitter/we_cmdargs.h
+++ b/writeengine/splitter/we_cmdargs.h
@@ -81,6 +81,7 @@ public:
     {
         return fReadBufSize;
     }
+    int getMode()
     {
         return fMode;
     }