@ -236,7 +236,4 @@ _Pvt_Extensions
.fake/
*.ncrunchproject
*.ncrunchsolution
<<<<<<< HEAD
/Package.nuspec
=======
>>>>>>> master