From 40a3a1417a6224a5b6eff18c5a5ccd30ef8dcb82 Mon Sep 17 00:00:00 2001 From: Bruce Irschick Date: Fri, 17 Jun 2022 13:16:12 -0700 Subject: [PATCH] [AD-767] Correct merge error --- src/odbc-test/include/test_type.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/odbc-test/include/test_type.h b/src/odbc-test/include/test_type.h index 6232f2ba7..7a7ef61d6 100644 --- a/src/odbc-test/include/test_type.h +++ b/src/odbc-test/include/test_type.h @@ -45,9 +45,8 @@ struct TestType { TestType(int8_t i8Field, int16_t i16Field, int32_t i32Field, int64_t i64Field, const std::string& strField, float floatField, double doubleField, - bool boolField, const Guid& guidField, - const Date& dateField, const Time& timeField, - const Timestamp& timestampField) + bool boolField, const Guid& guidField, const Date& dateField, + const Time& timeField, const Timestamp& timestampField) : allNulls(false), i8Field(i8Field), i16Field(i16Field),