Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVeerapuram Varadhan <v.varadhan@gmail.com>2009-07-30 16:36:07 +0400
committerVeerapuram Varadhan <v.varadhan@gmail.com>2009-07-30 16:36:07 +0400
commitea3ee3d0742cefe62508123b86ad67dac62a6a96 (patch)
treee27669c54bf325a86a786c7ecd138705732d264d /mcs/class/System.Data/Test
parent8d5211d815d69a5b930994b30c7a7aa67cd3243b (diff)
Test fix.
svn path=/trunk/mcs/; revision=139064
Diffstat (limited to 'mcs/class/System.Data/Test')
-rw-r--r--mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/ChangeLog3
1 files changed, 0 insertions, 3 deletions
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/ChangeLog b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/ChangeLog
index f4b3b9aadce..729d1c0f090 100644
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/ChangeLog
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/ChangeLog
@@ -1,15 +1,12 @@
-<<<<<<< HEAD:class/System.Data/Test/ProviderTests/System.Data.SqlClient/ChangeLog
2009-07-28 Gert Driesen <drieseng@users.sourceforge.net>
* SqlCommandTest.cs: Improved test for invalid statement to cover
CloseConnection behavior.
-=======
2009-07-25 Veerapuram Varadhan <vvaradhan@novell.com>
* SqlDataAdapterTest.cs: Test fix.
->>>>>>> Test fix.:class/System.Data/Test/ProviderTests/System.Data.SqlClient/ChangeLog
2009-05-16 Veerapuram Varadhan <vvaradhan@novell.com>
* SqlParameterTest.cs: Added test for bug #382589.