diff --git a/best.txt b/best.txt index c9bc8e4..5cfd6fd 100644 --- a/best.txt +++ b/best.txt @@ -2,4 +2,8 @@ +<<<<<<< HEAD ramen +======= +ramen +>>>>>>> 9423bebcfa670d5937166c6abd48094667c988c8 diff --git a/dumplings.txt b/dumplings.txt index 57feb94..1a6ccb6 100644 --- a/dumplings.txt +++ b/dumplings.txt @@ -1 +1,5 @@ +<<<<<<< HEAD pot_stickers +======= +pot_stickers +>>>>>>> 9423bebcfa670d5937166c6abd48094667c988c8 diff --git a/noodles.txt b/noodles.txt index 095c970..3f832b9 100644 --- a/noodles.txt +++ b/noodles.txt @@ -1 +1,5 @@ +<<<<<<< HEAD fettucineAlfredo +======= +fettucineAlfredo +>>>>>>> 9423bebcfa670d5937166c6abd48094667c988c8