From 301c4fda6e81eecbe4abb9c0f89b28662fa05b1f Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Thu, 5 Jan 2023 09:55:25 -0800
Subject: [PATCH] fixes conflicts

---
 resources/views/hardware/labels.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/hardware/labels.blade.php b/resources/views/hardware/labels.blade.php
index 97d25295bd..b25b08a0a9 100644
--- a/resources/views/hardware/labels.blade.php
+++ b/resources/views/hardware/labels.blade.php
@@ -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 {