Merge branch 'dev' of https://github.com/coinfoundry/miningcore

# Conflicts: # src/MiningCore/Persistence/Model/Projections/MinerStats.cs
oliverw · Jan 2, 2018 · d02d154 · d02d154
2 parents 44bc44f + 7531411
commit d02d154
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/src/MiningCore/Persistence/Model/Projections/MinerStats.cs b/src/MiningCore/Persistence/Model/Projections/MinerStats.cs
@@ -35,8 +35,6 @@ public class WorkerPerformanceStatsContainer
         public Dictionary<string, WorkerPerformanceStats> Workers { get; set; }
     }
 
-namespace MiningCore.Persistence.Model.Projections
-{
     public class MinerStats
     {
         public ulong PendingShares { get; set; }