solve the conflict

2022-02-23 14:16:36 +08:00 · 2022-02-23 14:16:36 +08:00 · 13ec3fb960
commit 13ec3fb960
parent 77f4efede9 745f47d114
2 changed files with 3 additions and 0 deletions
--- a/dishes/home-cooking/老式锅包肉/老式锅包肉.md
+++ b/dishes/home-cooking/老式锅包肉/老式锅包肉.md
@ -7,7 +7,10 @@

 ## 必备原料和工具

+<<<<<<< HEAD

+=======
+>>>>>>> 745f47d114341517dad600e52edda3bd3d1ef070
 - 里脊肉
 - 大葱
 - 姜
--- a/tips/.DS_Store
+++ b/tips/.DS_Store