From 72a04939964bfaba31c32498977917e05fbc88a0 Mon Sep 17 00:00:00 2001
From: XuZhi <xuzhi@XuZhis-MacBook-Pro.local>
Date: Wed, 23 Feb 2022 14:21:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=A0=87=E7=82=B9=E7=AC=A6?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dishes/home-cooking/老式锅包肉/老式锅包肉.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dishes/home-cooking/老式锅包肉/老式锅包肉.md b/dishes/home-cooking/老式锅包肉/老式锅包肉.md
index bca8a776..9280aff0 100644
--- a/dishes/home-cooking/老式锅包肉/老式锅包肉.md
+++ b/dishes/home-cooking/老式锅包肉/老式锅包肉.md
@@ -7,10 +7,6 @@
 
 ## 必备原料和工具
 
-<<<<<<< HEAD
-
-=======
->>>>>>> 745f47d114341517dad600e52edda3bd3d1ef070
 - 里脊肉
 - 大葱
 - 姜