FIX_merge files

2024-11-12 08:27:02 +00:00 · 2024-11-12 08:27:02 +00:00 · 8915bc05e2
commit 8915bc05e2
parent e270ff2bcd
1 changed files with 0 additions and 17 deletions
--- a/app/Views/address_pdf_landscape_template.php
+++ b/app/Views/address_pdf_landscape_template.php
@ -23,31 +23,14 @@
        .from-address {
            text-align: left;
            float: left;
-<<<<<<< HEAD
            width: 100%;
-=======
-            width: 60%;
-            
-        }
-        .order-number {
-            text-align: right;
-            float: right;
-            width: 40%;
->>>>>>> 37dc008a4e67eb19b144ea570725193f87907964
        }
        .to-address {

            float: right;
-<<<<<<< HEAD
            width: 40%;
            clear: both;
            /* margin-top: 20px; Adjust for spacing in landscape */
-=======
-            width: 30%;
-            clear: both;
-            margin-top: 20px; /* Adjust for spacing in landscape */
-            /* padding-right: -200px; */
->>>>>>> 37dc008a4e67eb19b144ea570725193f87907964
        }
    </style>
 </head>