From 3a6c6b00eb4c62b24c5e5ca670142ac5a00d7847 Mon Sep 17 00:00:00 2001 From: ubq323 Date: Tue, 18 Jun 2024 22:46:31 +0100 Subject: o --- conflicts.txt | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 conflicts.txt (limited to 'conflicts.txt') 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 -- cgit v1.2.3