Skip to content

Commit

Permalink
change httputility namespace to prevent conflict, 1.0.5.6
Browse files Browse the repository at this point in the history
  • Loading branch information
NicolasDorier committed Oct 7, 2014
1 parent 7f3a9eb commit 3923345
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions NBitcoin/Payment/BitcoinUrlBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using System.Text;
using System.Threading.Tasks;
using System.Web;
using System.Web.NBitcoin;

namespace NBitcoin.Payment
{
Expand Down
2 changes: 1 addition & 1 deletion NBitcoin/Payment/HttpUtility.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
using System.Web.Util;
using NBitcoin.DataEncoders;

namespace System.Web
namespace System.Web.NBitcoin
{


Expand Down
1 change: 1 addition & 0 deletions NBitcoin/Payment/UriHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System.Text;
using System.Threading.Tasks;
using System.Web;
using System.Web.NBitcoin;

namespace NBitcoin.Payment
{
Expand Down
2 changes: 1 addition & 1 deletion NBitcoin/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.5.5")]
[assembly: AssemblyVersion("1.0.5.6")]
[assembly: AssemblyFileVersion("1.0.0.0")]

0 comments on commit 3923345

Please sign in to comment.