fix clock merge conflicts

2023-05-08 08:57:24 -06:00
parent 9671259f5c
commit f20bfb025b
8 changed files with 27 additions and 39 deletions
--- a/frontend/src/app/components/clock/clock.component.html
+++ b/frontend/src/app/components/clock/clock.component.html
@@ -20,7 +20,7 @@
          </ng-container>
          <ng-template #mempoolMode>
            <div class="block-sizer" [style]="blockSizerStyle">
-              <app-mempool-block-overview [index]="0"></app-mempool-block-overview>
+              <app-mempool-block-overview [index]="0" [pixelAlign]="true"></app-mempool-block-overview>
            </div>
          </ng-template>
          <div class="fader"></div>