From 3f58acf0f78275433eacee401c013330b2ad929d Mon Sep 17 00:00:00 2001
From: KWON <thexero@gmail.com>
Date: Mon, 29 Sep 2025 09:26:07 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B2=A0=EC=9D=B4=EC=BB=A4=EB=A6=AC=20?=
 =?UTF-8?q?=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/bakery/bakery_stock_excel.php | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/manager/bakery/bakery_stock_excel.php b/manager/bakery/bakery_stock_excel.php
index b27d579d8..9e6326fde 100644
--- a/manager/bakery/bakery_stock_excel.php
+++ b/manager/bakery/bakery_stock_excel.php
@@ -128,7 +128,6 @@ foreach ( $result as $row) {
     $previous_stock = getPrevStock($searchDate, $row['barcode']);
     ?>
     <tr>
-<<<<<<< HEAD
         <td><?=$row['product_name']?></td>
         <td><?=$row['barcode']?></td>
         <td><?=number_format($previous_stock)?></td>
@@ -142,21 +141,6 @@ foreach ( $result as $row) {
         <td><?=number_format($row['menu_discount'])?></td>
         <td><?=number_format($row['payment_amount'])?></td>
         <td><?=number_format($row['current_stock'])?></td>
-=======
-        <td class="line"><?=$row['product_name']?></td>
-        <td class="line"><?=$row['barcode']?></td>
-        <td class="line"><?=number_format(getPrevStock($searchDate, $row['barcode']))?></td>
-        <td class="line"><?=number_format($row['production'])?></td>
-        <td class="line"><?=number_format($row['inhouse_use'])?></td>
-        <td class="line"><?=number_format($row['recycling'])?></td>
-        <td class="line"><?=number_format($row['disposal'])?></td>
-        <td class="line"><?=number_format($row['sales'])?></td>
-        <td class="line"><?=($row['sales'] != 0 && $row['sales_amount'] != 0) ? number_format($row['sales_amount']/$row['sales']) : 0 ?></td>
-        <td class="line"><?=number_format($row['sales_amount'])?></td>
-        <td class="line"><?=number_format($row['menu_discount'])?></td>
-        <td class="line"><?=number_format($row['payment_amount'])?></td>
-        <td class="line"><?=number_format($row['current_stock'])?></td>
->>>>>>> manager
     </tr>
     <?php