summaryrefslogtreecommitdiff
path: root/package/totd
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-02-26 23:40:31 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-02-26 23:40:31 +0100
commita4137f916eed4e87434e5382573008c89c8f1652 (patch)
tree3ddb4c0a6eda021657996e9d309e5080df83ad63 /package/totd
parent26f7c999e7c586eeb0eabeaf34ebbc9b3c145d7c (diff)
parent27537f0ac386cd2d869a73d2c4d432be2dffb9eb (diff)
resolve merge problems
Diffstat (limited to 'package/totd')
0 files changed, 0 insertions, 0 deletions