fix merge error

1af6678c · shenglian zhou · 42fae6e2 · 1af6678c
隐藏空白更改
内联并排

Showing with 0 addition and 1 deletion

src/query/src/qAggMain.c src/query/src/qAggMain.c +0 -1

未找到文件。
--- a/src/query/src/qAggMain.c
+++ b/src/query/src/qAggMain.c
@@ -495,7 +495,6 @@ int32_t getResultDataInfo(int32_t dataType, int32_t dataBytes, int32_t functionI
 // TODO use hash table
 int32_t isValidFunction(const char* name, int32_t len) {
-<<<<<<< HEAD
  for (int32_t i = 0; i < TSDB_FUNC_SCALAR_MAX_NUM; ++i) {
    int32_t nameLen = (int32_t) strlen(aScalarFunctions[i].name);