[AD-767] Correct merge error

aws · Jun 17, 2022 · 40a3a14 · 40a3a14
1 parent 68ad8b6
commit 40a3a14
Showing 1 changed file with 2 additions and 3 deletions.
diff --git 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),