summaryrefslogtreecommitdiffstats
path: root/bigeye
diff options
context:
space:
mode:
authortv <tv@nomic.retiolum>2014-03-14 04:33:13 +0100
committertv <tv@nomic.retiolum>2014-03-14 04:33:13 +0100
commitd5d9073f5317290b7aa679d930c2718cd1cdec20 (patch)
tree8d805aea5b3597fa14ca303f6da3b9dfa326034d /bigeye
parentcd2e096f32cc1baa325c3dcdc0c51e7a9f5052f8 (diff)
irc-announce: fix conflict resolution fail
Diffstat (limited to 'bigeye')
0 files changed, 0 insertions, 0 deletions