resolve conflict in schedule

RUI LUO · RUI LUO · commit 734b657303f0 · 2025-03-18T03:56:52.000Z
diff --git a/test/JDBC/upgrade/latest/schedule b/test/JDBC/upgrade/latest/schedule
@@ -603,4 +603,8 @@ test_conv_float_to_varchar_char
 BABEL_OBJECT_RESOLUTION_IN_ROUTINES
 alter-mvu-test
 test_constraint_like
-round_return_type_test
+<<<<<<< HEAD
+round_return_type_test
+=======
+round_return_type_test
+>>>>>>> ee92cc1c2 (resolve conflict in schedule)
