summaryrefslogtreecommitdiff
path: root/Rakefile
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2017-08-15 11:32:21 -0700
committerelijah <elijah@riseup.net>2017-08-15 11:32:21 -0700
commit8b0974e22f4b48ddb4d1fded9c4f65d4b6a88180 (patch)
treedbc872dd00e54ea0a969cf63aa83a942e31992e7 /Rakefile
parentbc9dc8e62a01b9f961026e7d33be4d9f92763920 (diff)
remove merge cruft
Diffstat (limited to 'Rakefile')
0 files changed, 0 insertions, 0 deletions