about summary refs log tree commit diff
path: root/app/javascript/flavours
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2020-02-21 01:51:53 -0600
committermultiple creatures <dev@multiple-creature.party>2020-02-21 01:51:53 -0600
commit8a60792b01780b4741d1c6de0048bccd9887cb01 (patch)
tree18cfaf2c889402ff3fa71e9c4694e5433cac1629 /app/javascript/flavours
parent0a238f34b39b606d5f20e1ef1fbdd2a8c56951db (diff)
get rid of stray merge conflict
Diffstat (limited to 'app/javascript/flavours')
0 files changed, 0 insertions, 0 deletions