resolve merge conflict

dotnet · Nov 6, 2019 · 33735e4 · 33735e4
1 parent bcaaaa3
commit 33735e4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs
@@ -3967,8 +3967,8 @@ partial void SetStackInternal(string value)
             private _SqlMetaDataSetCollection _snapshotCleanupAltMetaDataSetArray;
 
             internal byte[] _plpBuffer;
-
-            private readonly TdsParserStateObject _stateObj;
+            private PLPData _plpData;
+            private TdsParserStateObject _stateObj;
 
             private int _snapshotInBuffCount;
             private int _snapshotInBuffCurrent;