diff options
Diffstat (limited to 'conflicts_orig.txt')
| -rw-r--r-- | conflicts_orig.txt | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/conflicts_orig.txt b/conflicts_orig.txt new file mode 100644 index 0000000..92998e5 --- /dev/null +++ b/conflicts_orig.txt @@ -0,0 +1,15 @@ +bean soup: tomato soup, squash soup, bean soup, chilli +chickpea curry: mj curry, chickpea curry +chilli: chilli, gurger +fast ramen: fast ramen, ramen +gurger: jacket beans, chilli, gurger +jacket beans: jacket beans, mash, gurger +mash: jacket beans, mash +mj curry: mj spghet, mj curry, tomato soup, mj penne, chickpea curry +mj penne: mj spghet, mj curry, tomato soup, mj penne +mj spghet: mj spghet, mj curry, tomato soup, mj penne +ramen: fast ramen, ramen +squash soup: tomato soup, squash soup, bean soup +stir fry: stir fry, fast ramen, ramen +tomato soup: tomato soup, squash soup, bean soup, mj spghet, mj curry +vesto/egg: vesto/egg |