Removing conflicts

jahnvi480 · jahnvi480 · commit 3818ede09567 · 2025-12-10T16:29:34.000+05:30
diff --git a/mssql_python/pybind/ddbc_bindings.cpp b/mssql_python/pybind/ddbc_bindings.cpp
@@ -2848,7 +2848,7 @@ py::object FetchLobColumnData(SQLHSTMT hStmt, SQLUSMALLINT colIndex, SQLSMALLINT
         LOG_ERROR("FetchLobColumnData: Failed to decode with '%s' for column %d: %s",
                   charEncoding.c_str(), colIndex, e.what());
         // Return raw bytes as fallback
-        return raw_bytes
+        return raw_bytes;
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2848,7 +2848,7 @@ py::object FetchLobColumnData(SQLHSTMT hStmt, SQLUSMALLINT colIndex, SQLSMALLINT`
`2848`	`2848`	`LOG_ERROR("FetchLobColumnData: Failed to decode with '%s' for column %d: %s",`
`2849`	`2849`	`charEncoding.c_str(), colIndex, e.what());`
`2850`	`2850`	`// Return raw bytes as fallback`
`2851`		`- return raw_bytes`
	`2851`	`+ return raw_bytes;`
`2852`	`2852`	`}`
`2853`	`2853`	`}`
`2854`	`2854`