Fix forgotten merge conflict.

2016-02-08 10:55:08 +02:00
parent c579ed7fce
commit 0cc3db9634
1 changed files with 0 additions and 9 deletions
--- a/query_classifier/query_classifier.cc
+++ b/query_classifier/query_classifier.cc
@ -133,21 +133,12 @@ bool qc_is_real_query(GWBUF* query)

    return classifier->qc_is_real_query(query);
 }
-<<<<<<< HEAD

 char** qc_get_table_names(GWBUF* query, int* tblsize, bool fullnames)
 {
    QC_TRACE();
    ss_dassert(classifier);

-=======
-
-char** qc_get_table_names(GWBUF* query, int* tblsize, bool fullnames)
-{
-    QC_TRACE();
-    ss_dassert(classifier);
-
->>>>>>> origin/MXS-517
    return classifier->qc_get_table_names(query, tblsize, fullnames);
 }