mirror of
https://github.com/mempool/mempool.git
synced 2024-11-20 10:21:52 +01:00
correcting merge
This commit is contained in:
parent
9059c0c7e4
commit
bd67eec777
@ -126,7 +126,7 @@ class WebsocketHandler {
|
||||
'vBytesPerSecond': memPool.getVBytesPerSecond(),
|
||||
'lastDifficultyAdjustment': blocks.getLastDifficultyAdjustmentTime(),
|
||||
'blocks': _blocks,
|
||||
'conversions': fiatConversion.getTickers()['BTCUSD'],
|
||||
'conversions': fiatConversion.getConversionRates(),
|
||||
'mempool-blocks': mempoolBlocks.getMempoolBlocks(),
|
||||
'transactions': memPool.getLatestTransactions(),
|
||||
'git-commit': backendInfo.gitCommitHash,
|
||||
|
Loading…
Reference in New Issue
Block a user