Merge conflict fix p2.

microsoft · Nov 15, 2023 · d41e1f8 · d41e1f8
1 parent eb69fe1
commit d41e1f8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDriver.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDriver.java
@@ -697,7 +697,7 @@ enum SQLServerDriverBooleanProperty {
     IGNORE_OFFSET_ON_DATE_TIME_OFFSET_CONVERSION("ignoreOffsetOnDateTimeOffsetConversion", false),
     USE_DEFAULT_JAAS_CONFIG("useDefaultJaasConfig", false),
     USE_DEFAULT_GSS_CREDENTIAL("useDefaultGSSCredential", false),
-    USE_FLEXIBLE_CALLABLE_STATEMENTS("useFlexibleCallableStatements", true)
+    USE_FLEXIBLE_CALLABLE_STATEMENTS("useFlexibleCallableStatements", true),
     CALC_BIG_DECIMAL_SCALE("calcBigDecimalScale", false);
 
     private final String name;