fixes conflicts

This commit is contained in:
Godfrey M 2023-01-05 09:55:25 -08:00
parent 38575e93e8
commit 301c4fda6e

View file

@ -52,7 +52,7 @@ $qr_size = ($settings->alt_barcode_enabled=='1') && ($settings->alt_barcode!='')
}
img.barcode {
display:block;
padding-top: .11in;
margin-top:-7px;
width: 100%;
}
div.label-logo {