From d41e1f8af2052c3cfee4e1dfb78787b86061ea10 Mon Sep 17 00:00:00 2001
From: Terry Chow <v-terrychow@microsoft.com>
Date: Wed, 15 Nov 2023 10:10:39 -0800
Subject: [PATCH] Merge conflict fix p2.

---
 src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDriver.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDriver.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDriver.java
index bdb4bf11e..727e165b1 100644
--- 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;