Merge branch 'projectlock' of https://github.com/sebastienros/dapper-dot-net...

Merge branch 'projectlock' of https://github.com/sebastienros/dapper-dot-net into sebastienros-projectlock Conflicts: Dapper.DNX.Tests/project.lock.json Dapper/project.lock.json

Merge branch 'projectlock' of https://github.com/sebastienros/dapper-dot-net...
Merge branch 'projectlock' of https://github.com/sebastienros/dapper-dot-net into sebastienros-projectlock Conflicts: Dapper.DNX.Tests/project.lock.json Dapper/project.lock.json
8d7f16a2 · Marc Gravell · f7ffac3f · 1b58d10b · f7ffac3f · f7ffac3f
Commit 8d7f16a2 authored Nov 06, 2015 by Marc Gravell
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4907 deletions

project.lock.json Dapper.DNX.Tests/project.lock.json +0 -2650

project.lock.json Dapper/project.lock.json +0 -2257

No files found.
--- a/Dapper.DNX.Tests/project.lock.json
+++ b/Dapper.DNX.Tests/project.lock.json
--- a/Dapper/project.lock.json
+++ b/Dapper/project.lock.json