diff options
| author | ubq323 <ubq323@ubq323.website> | 2024-06-18 22:46:31 +0100 |
|---|---|---|
| committer | ubq323 <ubq323@ubq323.website> | 2024-06-18 22:46:31 +0100 |
| commit | 3a6c6b00eb4c62b24c5e5ca670142ac5a00d7847 (patch) | |
| tree | ea841da8e25da3489f6ed0c050c2213095e981a8 /conflicts.txt | |
Diffstat (limited to 'conflicts.txt')
| -rw-r--r-- | conflicts.txt | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/conflicts.txt b/conflicts.txt new file mode 100644 index 0000000..1d7a968 --- /dev/null +++ b/conflicts.txt @@ -0,0 +1,22 @@ +--- +soup: bean soup, tomato soup, squash soup +curry: chickpea curry, mj curry +potato: mash, jacket beans +greens: ramen, fast ramen, stir fry +tomato: tomato soup, mj spghet, mj curry +meat: chilli, gurger +beans: bean soup, chilli + +bean soup: soup, beans +tomato soup: soup, tomato +squash soup: soup +chickpea curry: curry +mj curry: curry, tomato +mash: potato +jacket beans: potato +ramen: greens +fast ramen: greens +stir fry: greens +mj spghet: tomato +chilli: meat, beans +gurger: meat |