Merge branch 'master' into tumble-bit

4ea339fe · Jeremy Bokobza · GitHub · a464e3f1 · 5d823d76 · 4ea339fe
Commit 4ea339fe authored May 30, 2017 by Jeremy Bokobza Committed by GitHub May 30, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

ITumblerService.cs Breeze/src/Breeze.TumbleBit.Client/ITumblerService.cs +1 -1

TumblerService.cs Breeze/src/Breeze.TumbleBit.Client/TumblerService.cs +1 -1

No files found.
--- a/Breeze/src/Breeze.TumbleBit.Client/ITumblerService.cs
+++ b/Breeze/src/Breeze.TumbleBit.Client/ITumblerService.cs
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Breeze.TumbleBit.Models;
 using NBitcoin;
 using NTumbleBit;

--- a/Breeze/src/Breeze.TumbleBit.Client/TumblerService.cs
+++ b/Breeze/src/Breeze.TumbleBit.Client/TumblerService.cs
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Breeze.TumbleBit.Models;