Commit 48c5ec4
committed
Merge branch 'master' into microsoft-data-sqlclient
# Conflicts:
# RELEASE_NOTES.md
# netfx.props
# nuget/SqlClient.nuspec
# paket.dependencies
# paket.lock
# src/SqlClient.DesignTime/AssemblyInfo.fs
# src/SqlClient.Samples/WebApi.Controllers/App.config
# src/SqlClient.Samples/WebApi/web.config
# src/SqlClient.Samples/WpfDataBinding/App.config
# src/SqlClient.TestProjects/Lib/Script.fsx
# src/SqlClient/AssemblyInfo.fs
# src/SqlClient/DataTable.fsFile tree
2 files changed
+6
-1
lines changed- src/SqlClient.Samples/WpfDataBinding
2 files changed
+6
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
6 | 11 | | |
7 | 12 | | |
8 | 13 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
| 2 | + | |
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| |||
0 commit comments