machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove merge conflict cruft

Browse Source
This commit is contained in:
hunicus 2023-01-31 10:30:16 -05:00 committed by GitHub
parent 7ce67f7ca5
commit e3c1343a24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/app/components/block/block.component.scss
View File

@ -232,8 +232,6 @@ h1 {
margin-right: 1em; margin-right: 1em;
} }
} }
<<<<<<< hunicus/block-health-faq
=======
.beta { .beta {
font-size: 10px; font-size: 10px;
@ -243,4 +241,3 @@ h1 {
top: 11px; top: 11px;
margin-left: 10px; margin-left: 10px;
} }
>>>>>>> master