summaryrefslogtreecommitdiff
path: root/conflicts_orig.txt
blob: 92998e5e07a85839bb5ced45669490f33e5302bd (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
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