summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-01-25 22:42:31 +0100
committerMichael Vogt <mvo@debian.org>2014-01-25 22:42:31 +0100
commitf4a631adf2f14c99d61ecb7f61cb1b3625c1cde4 (patch)
tree5e68ad3b1a0aaf2924a20378319947659ebf2340 /test
parent39471b17085c94aa546f0839b4181af36b7bea4d (diff)
remove merge artifact
Diffstat (limited to 'test')
0 files changed, 0 insertions, 0 deletions