mirror of
https://github.com/snipe/snipe-it.git
synced 2025-02-21 03:15:45 -08:00
fixes conflicts
This commit is contained in:
parent
38575e93e8
commit
301c4fda6e
|
@ -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 {
|
||||
|
|
Loading…
Reference in a new issue