Merge branch '2.2' into develop

2018-03-21 15:18:11 +02:00 · 2018-03-21 15:18:11 +02:00 · 296bac45c1
commit 296bac45c1
parent 9c6e15b426 0e3874781f
1 changed files with 0 additions and 1 deletions
--- a/query_classifier/qc_sqlite/sqlite-src-3110100/src/parse.y
+++ b/query_classifier/qc_sqlite/sqlite-src-3110100/src/parse.y
@ -615,7 +615,6 @@ columnid(A) ::= nm(X). {
  BINARY
  /*CASCADE*/ CAST CLOSE COLUMNKW COLUMNS COMMENT CONCURRENT /*CONFLICT*/
  DATA /*DATABASE*/ DEALLOCATE DEFERRED /*DESC*/ /*DETACH*/ DUMPFILE
-<<<<<<< 9208d3a70ce049a5eff1078dc741b0f4c271cff7
  /*EACH*/ END ENGINE ENUM EXCLUSIVE /*EXPLAIN*/
  FIRST FLUSH /*FOR*/ FORMAT
  GLOBAL